You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/09/12 17:59:00 UTC
svn commit: r694716 - in /cxf/trunk:
maven-plugins/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/
rt/frontend/jaxws/src/main/resources/META-INF/cxf/
rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/
Author: dkulp
Date: Fri Sep 12 08:59:00 2008
New Revision: 694716
URL: http://svn.apache.org/viewvc?rev=694716&view=rev
Log:
[CXF-1782, CXF-1796] Updates to Servlet controller stuff to make it more subclassable
Reduce logging in fastinfoset plugin
Modified:
cxf/trunk/maven-plugins/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/XML2FastInfosetCompilerMojo.java
cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractCXFServlet.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
Modified: cxf/trunk/maven-plugins/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/XML2FastInfosetCompilerMojo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/XML2FastInfosetCompilerMojo.java?rev=694716&r1=694715&r2=694716&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/XML2FastInfosetCompilerMojo.java (original)
+++ cxf/trunk/maven-plugins/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/XML2FastInfosetCompilerMojo.java Fri Sep 12 08:59:00 2008
@@ -106,7 +106,7 @@
}
if (!resourceDirectory.exists()) {
- getLog().info("Resource directory does not exist: " + resourceDirectory);
+ getLog().debug("Resource directory does not exist: " + resourceDirectory);
continue;
}
@@ -136,8 +136,7 @@
List includedFiles = Arrays.asList(scanner.getIncludedFiles());
- getLog().info(
- "FastInfosetting " + includedFiles.size() + " resource"
+ getLog().debug("FastInfosetting " + includedFiles.size() + " resource"
+ (includedFiles.size() > 1 ? "s" : "")
+ (targetPath == null ? "" : " to " + targetPath));
Modified: cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml?rev=694716&r1=694715&r2=694716&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml Fri Sep 12 08:59:00 2008
@@ -27,5 +27,7 @@
<bean class="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver"
id="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver" lazy-init="false"/>
<bean class="org.apache.cxf.jaxws.context.WebServiceContextImpl"
- id="org.apache.cxf.jaxws.context.WebServiceContextImpl"/>
+ id="org.apache.cxf.jaxws.context.WebServiceContextImpl" lazy-init="true"/>
+ <bean class="org.apache.cxf.jaxws.context.WebServiceContextImpl"
+ id="javax.xml.ws.WebServiceContext" lazy-init="true"/>
</beans>
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractCXFServlet.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractCXFServlet.java?rev=694716&r1=694715&r2=694716&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractCXFServlet.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractCXFServlet.java Fri Sep 12 08:59:00 2008
@@ -53,7 +53,8 @@
public ServletController createServletController(ServletConfig servletConfig) {
String hideServiceList = servletConfig.getInitParameter("hide-service-list-page");
- ServletController newController = new ServletController(servletTransportFactory, this);
+ ServletController newController =
+ new ServletController(servletTransportFactory, this.getServletContext(), bus);
if (hideServiceList != null) {
newController.setHideServiceList(Boolean.valueOf(hideServiceList));
}
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=694716&r1=694715&r2=694716&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Fri Sep 12 08:59:00 2008
@@ -29,6 +29,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -48,16 +49,18 @@
private static final Logger LOG = LogUtils.getL7dLogger(ServletController.class);
private ServletTransportFactory transport;
- private AbstractCXFServlet cxfServlet;
+ private ServletContext servletContext;
+ private Bus bus;
private String lastBase = "";
private boolean isHideServiceList;
private boolean disableAddressUpdates;
private String forcedBaseAddress;
private String serviceListStyleSheet;
- public ServletController(ServletTransportFactory df, AbstractCXFServlet servlet) {
+ public ServletController(ServletTransportFactory df, ServletContext context, Bus b) {
this.transport = df;
- this.cxfServlet = servlet;
+ this.servletContext = context;
+ this.bus = b;
df.setServletController(this);
}
@@ -130,7 +133,6 @@
}
} else {
ei = d.getEndpointInfo();
- Bus bus = cxfServlet.getBus();
if (null != request.getQueryString()
&& request.getQueryString().length() > 0
&& bus.getExtension(QueryHandlerRegistry.class) != null) {
@@ -182,7 +184,7 @@
return null;
}
- private void generateServiceList(HttpServletRequest request, HttpServletResponse response)
+ protected void generateServiceList(HttpServletRequest request, HttpServletResponse response)
throws IOException {
if (request.getParameter("stylesheet") != null) {
@@ -280,7 +282,7 @@
}
try {
- d.invoke(cxfServlet.getServletContext(), request, response);
+ d.invoke(servletContext, request, response);
} catch (IOException e) {
throw new ServletException(e);
} finally {