Author: richard.opalka(a)jboss.com Date: 2009-02-11 04:53:35 -0500 (Wed, 11 Feb 2009) New Revision: 9279 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java stack/cxf/trunk/pom.xml Log: [JBWS-2417] round 1 (WIP) Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2009-02-10 17:18:22 UTC (rev 9278) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2009-02-11 09:53:35 UTC (rev 9279) @@ -86,7 +86,7 @@ public ServletController createServletController(ServletConfig servletConfig) { ServletTransportFactory stf = (ServletTransportFactory)createServletTransportFactory(); - return new ServletControllerExt(stf, servletConfig.getServletContext(), bus); + return new ServletControllerExt(stf, servletConfig, servletConfig.getServletContext(), bus); } @Override Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2009-02-10 17:18:22 UTC (rev 9278) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2009-02-11 09:53:35 UTC (rev 9279) @@ -26,6 +26,7 @@ import java.net.URL; import java.util.Collection; +import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -51,9 +52,9 @@ private ServletContext servletCtx; private Bus bus; - public ServletControllerExt(ServletTransportFactory cxfTransport, ServletContext servletCtx, Bus bus) + public ServletControllerExt(ServletTransportFactory cxfTransport, ServletConfig config, ServletContext servletCtx, Bus bus) { - super(cxfTransport, servletCtx, bus); + super(cxfTransport, config, servletCtx, bus); this.cxfTransport = cxfTransport; this.servletCtx = servletCtx; this.bus = bus; Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2009-02-10 17:18:22 UTC (rev 9278) +++ stack/cxf/trunk/pom.xml 2009-02-11 09:53:35 UTC (rev 9279) @@ -56,7 +56,7 @@ <jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version> <jbossws.jboss600.version>3.1.0-SNAPSHOT</jbossws.jboss600.version> <!-- END --> - <cxf.version>2.1.3</cxf.version> + <cxf.version>2.1.4</cxf.version> <cxf.stax.version>1.0.1</cxf.stax.version> <fastinfoset.api.version>1.2.2</fastinfoset.api.version> <jboss.common.version>1.2.1.GA</jboss.common.version> @@ -73,7 +73,7 @@ <log4j.version>1.2.14</log4j.version> <saaj.api.version>1.3</saaj.api.version> <velocity.version>1.5</velocity.version> - <xmlsec.version>1.4.0</xmlsec.version> + <xmlsec.version>1.4.2</xmlsec.version> </properties> <!-- DependencyManagement -->