Author: alessio.soldano(a)jboss.com Date: 2010-08-02 01:55:00 -0400 (Mon, 02 Aug 2010) New Revision: 12708 Modified: stack/cxf/branches/cxf-2.3/modules/server/pom.xml stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java stack/cxf/branches/cxf-2.3/pom.xml Log: Moving to Apache CXF 2.3.0-SNAPSHOT Modified: stack/cxf/branches/cxf-2.3/modules/server/pom.xml =================================================================== --- stack/cxf/branches/cxf-2.3/modules/server/pom.xml 2010-08-02 05:53:45 UTC (rev 12707) +++ stack/cxf/branches/cxf-2.3/modules/server/pom.xml 2010-08-02 05:55:00 UTC (rev 12708) @@ -27,8 +27,8 @@ <artifactId>ejb-api</artifactId> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> </dependency> <!-- jbossws dependencies --> <dependency> Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java 2010-08-02 05:53:45 UTC (rev 12707) +++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java 2010-08-02 05:55:00 UTC (rev 12708) @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.PrintWriter; +import java.util.Collection; import java.util.Locale; import javax.servlet.ServletOutputStream; @@ -221,5 +222,20 @@ { delegate.setLocale(loc); } + + public String getHeader(String arg0) + { + return delegate.getHeader(arg0); + } + + public Collection<String> getHeaderNames() + { + return delegate.getHeaderNames(); + } + + public Collection<String> getHeaders(String arg0) + { + return delegate.getHeaders(arg0); + } } Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-02 05:53:45 UTC (rev 12707) +++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-02 05:55:00 UTC (rev 12708) @@ -69,6 +69,7 @@ { registerTransport(factory, s); } + registerTransport(factory, "http://schemas.xmlsoap.org/soap/http"); } /** Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java 2010-08-02 05:53:45 UTC (rev 12707) +++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java 2010-08-02 05:55:00 UTC (rev 12708) @@ -37,7 +37,7 @@ public TomcatHTTPDestination(Bus b, TomcatHTTPTransportFactory ci, EndpointInfo ei, boolean dp) throws IOException { - super(b, ci, ei, dp); + super(b, ei, dp); this.transportFactory = ci; } Modified: stack/cxf/branches/cxf-2.3/pom.xml =================================================================== --- stack/cxf/branches/cxf-2.3/pom.xml 2010-08-02 05:53:45 UTC (rev 12707) +++ stack/cxf/branches/cxf-2.3/pom.xml 2010-08-02 05:55:00 UTC (rev 12708) @@ -57,7 +57,7 @@ <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version> --> <!-- END --> - <cxf.version>2.2.9-patch-01</cxf.version> + <cxf.version>2.3.0-SNAPSHOT</cxf.version> <cxf.stax.version>1.0.1</cxf.stax.version> <cxf.asm.version>2.2.3</cxf.asm.version> <fastinfoset.api.version>1.2.7</fastinfoset.api.version> @@ -405,7 +405,15 @@ <artifactId>geronimo-servlet_2.5_spec</artifactId> </exclusion> <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-servlet_3.0_spec</artifactId> + </exclusion> + <exclusion> <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> </exclusion> <exclusion> @@ -1044,9 +1052,9 @@ <version>${jsr181.api.version}</version> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <version>1.0.0.Beta2</version> </dependency> <!-- jboss provided -->