[jbossws-commits] JBossWS SVN: r12864 - in stack/cxf/trunk: modules and 42 other directories.

Author: alessio.soldano(a)jboss.com Date: 2010-08-25 12:43:11 -0400 (Wed, 25 Aug 2010) New Revision: 12864 Added: stack/cxf/trunk/modules/addons/ stack/cxf/trunk/modules/addons/pom.xml stack/cxf/trunk/modules/addons/transports/ stack/cxf/trunk/modules/addons/transports/http/ stack/cxf/trunk/modules/addons/transports/http/httpserver/ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml stack/cxf/trunk/modules/addons/transports/http/httpserver/src/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/resources/ Removed: stack/cxf/trunk/modules/addons/pom.xml stack/cxf/trunk/modules/addons/transports/ stack/cxf/trunk/modules/addons/transports/http/ stack/cxf/trunk/modules/addons/transports/http/httpserver/ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml stack/cxf/trunk/modules/addons/transports/http/httpserver/src/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/resources/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java Modified: stack/cxf/trunk/modules/client/pom.xml stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jbossws.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: Moving to using Apache CXF 2.3.0-SNAPSHOT - Merging revisions 12707,12708,12709,121729,12733,12758,12759,12769,12770,12771,12824,12826,12828,12829,12841,12845,12846,12847,12848,12849 from https://svn.jboss.org/repos/jbossws/stack/cxf/branches/cxf-2.3 Copied: stack/cxf/trunk/modules/addons (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons) Property changes on: stack/cxf/trunk/modules/addons ___________________________________________________________________ Name: svn:ignore + target .project .classpath .settings Deleted: stack/cxf/trunk/modules/addons/pom.xml =================================================================== --- stack/cxf/branches/cxf-2.3/modules/addons/pom.xml 2010-08-25 08:57:14 UTC (rev 12849) +++ stack/cxf/trunk/modules/addons/pom.xml 2010-08-25 16:43:11 UTC (rev 12864) @@ -1,22 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>JBoss Web Services - Stack CXF Add-ons</name> - <artifactId>jbossws-cxf-addons</artifactId> - <packaging>pom</packaging> - - <!-- Parent --> - <parent> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf</artifactId> - <version>3.4.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <!-- Modules --> - <modules> - <module>transports/http/httpserver</module> - </modules> - -</project> Copied: stack/cxf/trunk/modules/addons/pom.xml (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/pom.xml) =================================================================== --- stack/cxf/trunk/modules/addons/pom.xml (rev 0) +++ stack/cxf/trunk/modules/addons/pom.xml 2010-08-25 16:43:11 UTC (rev 12864) @@ -0,0 +1,22 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBoss Web Services - Stack CXF Add-ons</name> + <artifactId>jbossws-cxf-addons</artifactId> + <packaging>pom</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf</artifactId> + <version>3.4.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <!-- Modules --> + <modules> + <module>transports/http/httpserver</module> + </modules> + +</project> Copied: stack/cxf/trunk/modules/addons/transports (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports) Copied: stack/cxf/trunk/modules/addons/transports/http (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver) Property changes on: stack/cxf/trunk/modules/addons/transports/http/httpserver ___________________________________________________________________ Name: svn:ignore + target .project .classpath .settings Deleted: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml =================================================================== --- stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/pom.xml 2010-08-25 08:57:14 UTC (rev 12849) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2010-08-25 16:43:11 UTC (rev 12864) @@ -1,90 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>JBoss Web Services - Stack CXF httpserver transport</name> - <artifactId>jbossws-cxf-transports-httpserver</artifactId> - <packaging>jar</packaging> - - <parent> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-addons</artifactId> - <version>3.4.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - - <!-- Dependencies --> - <dependencies> - - <dependency> - <groupId>org.jboss.ws.projects</groupId> - <artifactId>jaxws-httpserver-httpspi</artifactId> - </dependency> - - <!-- CXF dependencies --> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxws</artifactId> - </dependency> - - <!-- Spring --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-expression</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jms</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-tx</artifactId> - </dependency> - - <!-- - useStrictFiltering requires dependency in all included modules - http://jira.codehaus.org/browse/MASSEMBLY-317 - --> - - <dependency> - <groupId>org.jboss.spec.javax.xml.ws</groupId> - <artifactId>jboss-jaxws-api_2.2_spec</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.servlet</groupId> - <artifactId>jboss-servlet-api_3.0_spec</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - -</project> Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/pom.xml) =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml (rev 0) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2010-08-25 16:43:11 UTC (rev 12864) @@ -0,0 +1,90 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBoss Web Services - Stack CXF httpserver transport</name> + <artifactId>jbossws-cxf-transports-httpserver</artifactId> + <packaging>jar</packaging> + + <parent> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-addons</artifactId> + <version>3.4.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> + </parent> + + <!-- Dependencies --> + <dependencies> + + <dependency> + <groupId>org.jboss.ws.projects</groupId> + <artifactId>jaxws-httpserver-httpspi</artifactId> + </dependency> + + <!-- CXF dependencies --> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + </dependency> + + <!-- Spring --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </dependency> + + <!-- + useStrictFiltering requires dependency in all included modules + http://jira.codehaus.org/browse/MASSEMBLY-317 + --> + + <dependency> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymockclassextension</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + +</project> Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java/org) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java/org/jboss) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver) Deleted: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2010-08-25 08:57:14 UTC (rev 12849) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -1,153 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.addons.transports.httpserver; - -import java.io.IOException; -import java.net.URL; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.apache.cxf.Bus; -import org.apache.cxf.common.logging.LogUtils; -import org.apache.cxf.interceptor.Fault; -import org.apache.cxf.service.model.EndpointInfo; -import org.apache.cxf.transport.http_jaxws_spi.HttpHandlerImpl; -import org.apache.cxf.transport.http_jaxws_spi.JAXWSHttpSpiDestination; -import org.jboss.ws.httpserver_httpspi.HttpExchangeDelegate; - -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; - -/** - * HTTP destination to be used with the JDK6 httpserver; this extends the - * basic JAXWSHttpSpiDestination with all the mechanisms for properly - * handling destination and factory life-cycles. - * - * @author alessio.soldano(a)jboss.com - * @since 19-Aug-2010 - * - */ -@SuppressWarnings("restriction") -public class HttpServerDestination extends JAXWSHttpSpiDestination -{ - static final Logger LOG = LogUtils.getL7dLogger(HttpServerDestination.class); - - private static final long serialVersionUID = 1L; - - private HttpServerTransportFactory factory; - private HttpServerEngineFactory serverEngineFactory; - private HttpServerEngine engine; - private URL url; - - public HttpServerDestination(Bus b, HttpServerTransportFactory factory, EndpointInfo ei) throws IOException - { - super(b, ei); - this.factory = factory; - this.serverEngineFactory = factory.getServerEngineFactory(); - this.url = new URL(ei.getAddress()); - } - - @Override - protected Logger getLogger() - { - return LOG; - } - - public void finalizeConfig() throws IOException - { - engine = serverEngineFactory.retrieveHttpServerEngine(url.getPort()); - if (engine == null) - { - engine = serverEngineFactory.createHttpServerEngine(url.getHost(), url.getPort(), url.getProtocol()); - } - if (!url.getProtocol().equals(engine.getProtocol())) - { - throw new IllegalStateException("Port " + engine.getPort() + " is configured with wrong protocol \"" - + engine.getProtocol() + "\" for \"" + url + "\""); - } - } - - /** - * Activate receipt of incoming messages. - */ - protected void activate() - { - LOG.log(Level.FINE, "Activating receipt of incoming messages"); - String addr = endpointInfo.getAddress(); - try - { - new URL(addr); - } - catch (Exception e) - { - throw new Fault(e); - } - engine.addHandler(addr, new Handler(this)); - } - - /** - * Deactivate receipt of incoming messages. - */ - protected void deactivate() - { - LOG.log(Level.FINE, "Deactivating receipt of incoming messages"); - engine.removeHandler(endpointInfo.getAddress()); - } - - @Override - public void shutdown() - { - factory.removeDestination(endpointInfo); - super.shutdown(); - } - - class Handler extends HttpHandlerImpl implements HttpHandler - { - - public Handler(JAXWSHttpSpiDestination destination) - { - super(destination); - } - - @Override - public void handle(HttpExchange ex) throws IOException - { - try - { - this.handle(new HttpExchangeDelegate(ex)); - } - catch (Exception e) - { - LOG.throwing(Handler.class.getName(), "handle(com.sun.net.httpserver.HttpExchange ex)", e); - if (e instanceof IOException) - { - throw (IOException) e; - } - else - { - throw new RuntimeException(e); - } - } - } - } - -} Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java) =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java (rev 0) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -0,0 +1,153 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.cxf.addons.transports.httpserver; + +import java.io.IOException; +import java.net.URL; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.cxf.Bus; +import org.apache.cxf.common.logging.LogUtils; +import org.apache.cxf.interceptor.Fault; +import org.apache.cxf.service.model.EndpointInfo; +import org.apache.cxf.transport.http_jaxws_spi.HttpHandlerImpl; +import org.apache.cxf.transport.http_jaxws_spi.JAXWSHttpSpiDestination; +import org.jboss.ws.httpserver_httpspi.HttpExchangeDelegate; + +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; + +/** + * HTTP destination to be used with the JDK6 httpserver; this extends the + * basic JAXWSHttpSpiDestination with all the mechanisms for properly + * handling destination and factory life-cycles. + * + * @author alessio.soldano(a)jboss.com + * @since 19-Aug-2010 + * + */ +@SuppressWarnings("restriction") +public class HttpServerDestination extends JAXWSHttpSpiDestination +{ + static final Logger LOG = LogUtils.getL7dLogger(HttpServerDestination.class); + + private static final long serialVersionUID = 1L; + + private HttpServerTransportFactory factory; + private HttpServerEngineFactory serverEngineFactory; + private HttpServerEngine engine; + private URL url; + + public HttpServerDestination(Bus b, HttpServerTransportFactory factory, EndpointInfo ei) throws IOException + { + super(b, ei); + this.factory = factory; + this.serverEngineFactory = factory.getServerEngineFactory(); + this.url = new URL(ei.getAddress()); + } + + @Override + protected Logger getLogger() + { + return LOG; + } + + public void finalizeConfig() throws IOException + { + engine = serverEngineFactory.retrieveHttpServerEngine(url.getPort()); + if (engine == null) + { + engine = serverEngineFactory.createHttpServerEngine(url.getHost(), url.getPort(), url.getProtocol()); + } + if (!url.getProtocol().equals(engine.getProtocol())) + { + throw new IllegalStateException("Port " + engine.getPort() + " is configured with wrong protocol \"" + + engine.getProtocol() + "\" for \"" + url + "\""); + } + } + + /** + * Activate receipt of incoming messages. + */ + protected void activate() + { + LOG.log(Level.FINE, "Activating receipt of incoming messages"); + String addr = endpointInfo.getAddress(); + try + { + new URL(addr); + } + catch (Exception e) + { + throw new Fault(e); + } + engine.addHandler(addr, new Handler(this)); + } + + /** + * Deactivate receipt of incoming messages. + */ + protected void deactivate() + { + LOG.log(Level.FINE, "Deactivating receipt of incoming messages"); + engine.removeHandler(endpointInfo.getAddress()); + } + + @Override + public void shutdown() + { + factory.removeDestination(endpointInfo); + super.shutdown(); + } + + class Handler extends HttpHandlerImpl implements HttpHandler + { + + public Handler(JAXWSHttpSpiDestination destination) + { + super(destination); + } + + @Override + public void handle(HttpExchange ex) throws IOException + { + try + { + this.handle(new HttpExchangeDelegate(ex)); + } + catch (Exception e) + { + LOG.throwing(Handler.class.getName(), "handle(com.sun.net.httpserver.HttpExchange ex)", e); + if (e instanceof IOException) + { + throw (IOException) e; + } + else + { + throw new RuntimeException(e); + } + } + } + } + +} Deleted: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java 2010-08-25 08:57:14 UTC (rev 12849) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -1,137 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.addons.transports.httpserver; - -import java.io.IOException; -import java.net.InetSocketAddress; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.apache.cxf.Bus; -import org.apache.cxf.common.logging.LogUtils; -import org.jboss.ws.httpserver_httpspi.PathUtils; - -import com.sun.net.httpserver.HttpHandler; -import com.sun.net.httpserver.HttpServer; - -/** - * A server engine that internally uses the JDK6 httpserver - * - * @author alessio.soldano(a)jboss.com - * @since 19-Aug-2010 - * - */ -@SuppressWarnings("restriction") -public class HttpServerEngine -{ - private static final Logger LOG = LogUtils.getL7dLogger(HttpServerEngine.class); - private static final int DELAY = Integer.getInteger(System.getProperty(HttpServerEngineFactory.class.getName() + ".STOP_DELAY"), 1); - private static final int BACKLOG = 0; - - private Bus bus; - private HttpServerEngineFactory factory; - private String host; - private int port; - private int handlerCount; - private String protocol = "http"; - private HttpServer server; - - public HttpServerEngine(HttpServerEngineFactory fac, Bus bus, String host, int port) - { - this.bus = bus; - this.factory = fac; - this.host = host; - this.port = port; - } - - public Bus getBus() - { - return bus; - } - - public String getProtocol() - { - return protocol; - } - - public int getPort() - { - return port; - } - - public String getHost() - { - return host; - } - - public synchronized void addHandler(String address, HttpHandler handler) - { - if (server == null) //start the server on first call - { - InetSocketAddress isa = host != null ? new InetSocketAddress(host, port) : new InetSocketAddress(port); - try - { - server = HttpServer.create(isa, BACKLOG); - server.start(); - } - catch (IOException e) - { - throw new RuntimeException(e); - } - } - server.createContext(PathUtils.getContextPath(address) + PathUtils.getPath(address), handler); - handlerCount++; - } - - public synchronized void removeHandler(String address) - { - server.removeContext(PathUtils.getContextPath(address) + PathUtils.getPath(address)); - handlerCount--; - } - - /** - * This method is called by the ServerEngine Factory to destroy the server - */ - protected void stop() throws Exception - { - if (server != null) - { - server.stop(DELAY); - } - } - - /** - * This method will shut down the server engine and - * remove it from the factory's cache. - */ - public void shutdown() - { - if (factory != null && handlerCount == 0) - { - factory.destroyForPort(port); - } - else - { - LOG.log(Level.WARNING, "FAILED_TO_SHUTDOWN_ENGINE_MSG", port); - } - } -} Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java) =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java (rev 0) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -0,0 +1,137 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.cxf.addons.transports.httpserver; + +import java.io.IOException; +import java.net.InetSocketAddress; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.cxf.Bus; +import org.apache.cxf.common.logging.LogUtils; +import org.jboss.ws.httpserver_httpspi.PathUtils; + +import com.sun.net.httpserver.HttpHandler; +import com.sun.net.httpserver.HttpServer; + +/** + * A server engine that internally uses the JDK6 httpserver + * + * @author alessio.soldano(a)jboss.com + * @since 19-Aug-2010 + * + */ +@SuppressWarnings("restriction") +public class HttpServerEngine +{ + private static final Logger LOG = LogUtils.getL7dLogger(HttpServerEngine.class); + private static final int DELAY = Integer.getInteger(System.getProperty(HttpServerEngineFactory.class.getName() + ".STOP_DELAY"), 1); + private static final int BACKLOG = 0; + + private Bus bus; + private HttpServerEngineFactory factory; + private String host; + private int port; + private int handlerCount; + private String protocol = "http"; + private HttpServer server; + + public HttpServerEngine(HttpServerEngineFactory fac, Bus bus, String host, int port) + { + this.bus = bus; + this.factory = fac; + this.host = host; + this.port = port; + } + + public Bus getBus() + { + return bus; + } + + public String getProtocol() + { + return protocol; + } + + public int getPort() + { + return port; + } + + public String getHost() + { + return host; + } + + public synchronized void addHandler(String address, HttpHandler handler) + { + if (server == null) //start the server on first call + { + InetSocketAddress isa = host != null ? new InetSocketAddress(host, port) : new InetSocketAddress(port); + try + { + server = HttpServer.create(isa, BACKLOG); + server.start(); + } + catch (IOException e) + { + throw new RuntimeException(e); + } + } + server.createContext(PathUtils.getContextPath(address) + PathUtils.getPath(address), handler); + handlerCount++; + } + + public synchronized void removeHandler(String address) + { + server.removeContext(PathUtils.getContextPath(address) + PathUtils.getPath(address)); + handlerCount--; + } + + /** + * This method is called by the ServerEngine Factory to destroy the server + */ + protected void stop() throws Exception + { + if (server != null) + { + server.stop(DELAY); + } + } + + /** + * This method will shut down the server engine and + * remove it from the factory's cache. + */ + public void shutdown() + { + if (factory != null && handlerCount == 0) + { + factory.destroyForPort(port); + } + else + { + LOG.log(Level.WARNING, "FAILED_TO_SHUTDOWN_ENGINE_MSG", port); + } + } +} Deleted: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java 2010-08-25 08:57:14 UTC (rev 12849) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -1,151 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.addons.transports.httpserver; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.annotation.Resource; - -import org.apache.cxf.Bus; -import org.apache.cxf.buslifecycle.BusLifeCycleListener; -import org.apache.cxf.buslifecycle.BusLifeCycleManager; -import org.apache.cxf.common.logging.LogUtils; - -/** - * A server engine factory for the JDK6-based httpserver engine - * - * @author alessio.soldano(a)jboss.com - * @since 19-Aug-2010 - * - */ -public class HttpServerEngineFactory implements BusLifeCycleListener -{ - private static final Logger LOG = LogUtils.getL7dLogger(HttpServerEngineFactory.class); - private static Map<Integer, HttpServerEngine> portMap = new HashMap<Integer, HttpServerEngine>(); - - private BusLifeCycleManager lifeCycleManager; - private Bus bus; - - public HttpServerEngineFactory(Bus b) - { - setBus(b); - } - - /** - * This call is used to set the bus. It should only be called once. - * @param bus - */ - @Resource(name = "cxf") - public final void setBus(Bus bus) - { - assert this.bus == null || this.bus == bus; - this.bus = bus; - if (bus != null) - { - bus.setExtension(this, HttpServerEngineFactory.class); - lifeCycleManager = bus.getExtension(BusLifeCycleManager.class); - if (null != lifeCycleManager) - { - lifeCycleManager.registerLifeCycleListener(this); - } - } - } - - public Bus getBus() - { - return bus; - } - - /** - * Retrieve a previously configured HttpServerEngine for the - * given port. If none exists, this call returns null. - */ - public synchronized HttpServerEngine retrieveHttpServerEngine(int port) - { - return portMap.get(port); - } - - public synchronized HttpServerEngine createHttpServerEngine(String host, int port, String protocol) - throws IOException - { - LOG.fine("Creating HttpServer Engine for port " + port + "."); - HttpServerEngine ref = retrieveHttpServerEngine(port); - if (null == ref) - { - ref = new HttpServerEngine(this, bus, host, port); - portMap.put(port, ref); - } - // checking the protocol - if (!protocol.equals(ref.getProtocol())) - { - throw new IOException("Protocol mismatch for port " + port + ": " + "engine's protocol is " - + ref.getProtocol() + ", the url protocol is " + protocol); - } - return ref; - } - - /** - * This method removes the Server Engine from the port map and stops it. - */ - public synchronized void destroyForPort(int port) - { - HttpServerEngine ref = portMap.remove(port); - if (ref != null) - { - LOG.fine("Stopping HttpServer Engine on port " + port + "."); - try - { - ref.stop(); - } - catch (Exception e) - { - LOG.log(Level.WARNING, "", e); - } - } - } - - public void initComplete() - { - // do nothing here - } - - public void postShutdown() - { - // shut down the httpserver in the portMap - // To avoid the CurrentModificationException, - // do not use portMap.vaules directly - HttpServerEngine[] engines = portMap.values().toArray(new HttpServerEngine[0]); - for (HttpServerEngine engine : engines) - { - engine.shutdown(); - } - } - - public void preShutdown() - { - // do nothing here - } -} Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java) =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java (rev 0) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -0,0 +1,151 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.cxf.addons.transports.httpserver; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.annotation.Resource; + +import org.apache.cxf.Bus; +import org.apache.cxf.buslifecycle.BusLifeCycleListener; +import org.apache.cxf.buslifecycle.BusLifeCycleManager; +import org.apache.cxf.common.logging.LogUtils; + +/** + * A server engine factory for the JDK6-based httpserver engine + * + * @author alessio.soldano(a)jboss.com + * @since 19-Aug-2010 + * + */ +public class HttpServerEngineFactory implements BusLifeCycleListener +{ + private static final Logger LOG = LogUtils.getL7dLogger(HttpServerEngineFactory.class); + private static Map<Integer, HttpServerEngine> portMap = new HashMap<Integer, HttpServerEngine>(); + + private BusLifeCycleManager lifeCycleManager; + private Bus bus; + + public HttpServerEngineFactory(Bus b) + { + setBus(b); + } + + /** + * This call is used to set the bus. It should only be called once. + * @param bus + */ + @Resource(name = "cxf") + public final void setBus(Bus bus) + { + assert this.bus == null || this.bus == bus; + this.bus = bus; + if (bus != null) + { + bus.setExtension(this, HttpServerEngineFactory.class); + lifeCycleManager = bus.getExtension(BusLifeCycleManager.class); + if (null != lifeCycleManager) + { + lifeCycleManager.registerLifeCycleListener(this); + } + } + } + + public Bus getBus() + { + return bus; + } + + /** + * Retrieve a previously configured HttpServerEngine for the + * given port. If none exists, this call returns null. + */ + public synchronized HttpServerEngine retrieveHttpServerEngine(int port) + { + return portMap.get(port); + } + + public synchronized HttpServerEngine createHttpServerEngine(String host, int port, String protocol) + throws IOException + { + LOG.fine("Creating HttpServer Engine for port " + port + "."); + HttpServerEngine ref = retrieveHttpServerEngine(port); + if (null == ref) + { + ref = new HttpServerEngine(this, bus, host, port); + portMap.put(port, ref); + } + // checking the protocol + if (!protocol.equals(ref.getProtocol())) + { + throw new IOException("Protocol mismatch for port " + port + ": " + "engine's protocol is " + + ref.getProtocol() + ", the url protocol is " + protocol); + } + return ref; + } + + /** + * This method removes the Server Engine from the port map and stops it. + */ + public synchronized void destroyForPort(int port) + { + HttpServerEngine ref = portMap.remove(port); + if (ref != null) + { + LOG.fine("Stopping HttpServer Engine on port " + port + "."); + try + { + ref.stop(); + } + catch (Exception e) + { + LOG.log(Level.WARNING, "", e); + } + } + } + + public void initComplete() + { + // do nothing here + } + + public void postShutdown() + { + // shut down the httpserver in the portMap + // To avoid the CurrentModificationException, + // do not use portMap.vaules directly + HttpServerEngine[] engines = portMap.values().toArray(new HttpServerEngine[0]); + for (HttpServerEngine engine : engines) + { + engine.shutdown(); + } + } + + public void preShutdown() + { + // do nothing here + } +} Deleted: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java 2010-08-25 08:57:14 UTC (rev 12849) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -1,118 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.addons.transports.httpserver; - -import java.io.IOException; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import javax.annotation.PostConstruct; -import javax.annotation.Resource; - -import org.apache.cxf.Bus; -import org.apache.cxf.service.model.EndpointInfo; -import org.apache.cxf.transport.Destination; -import org.apache.cxf.transport.DestinationFactory; -import org.apache.cxf.transport.http.AbstractHTTPTransportFactory; - -/** - * A Destination/Transport factory for the JDK6 httpserver - * - * @author alessio.soldano(a)jboss.com - * @since 19-Aug-2010 - * - */ -public class HttpServerTransportFactory extends AbstractHTTPTransportFactory implements DestinationFactory -{ - private Map<String, HttpServerDestination> destinations = new ConcurrentHashMap<String, HttpServerDestination>(); - - public HttpServerTransportFactory() - { - super(); - } - - @Resource - public void setBus(Bus b) - { - super.setBus(b); - } - - @PostConstruct - public void finalizeConfig() - { - if (null == bus) - { - return; - } - // This call will register the server engine factory - // with the Bus. - getServerEngineFactory(); - } - - protected HttpServerEngineFactory getServerEngineFactory() - { - HttpServerEngineFactory serverEngineFactory = getBus().getExtension(HttpServerEngineFactory.class); - // If it's not there, then create it and register it. - // Spring may override it later, but we need it here for default - // with no spring configuration. - if (serverEngineFactory == null) - { - serverEngineFactory = new HttpServerEngineFactory(bus); - serverEngineFactory.setBus(getBus()); - } - return serverEngineFactory; - } - - public Destination getDestination(EndpointInfo endpointInfo) throws IOException - { - String addr = endpointInfo.getAddress(); - HttpServerDestination destination = addr == null ? null : destinations.get(addr); - if (destination == null) - { - destination = createDestination(endpointInfo); - } - return destination; - } - - private synchronized HttpServerDestination createDestination(EndpointInfo endpointInfo) throws IOException - { - String addr = endpointInfo.getAddress(); - HttpServerDestination destination = addr == null ? null : destinations.get(addr); - if (destination == null) - { - destination = new HttpServerDestination(getBus(), this, endpointInfo); - destinations.put(endpointInfo.getAddress(), destination); - configure(destination); - destination.finalizeConfig(); - } - return destination; - } - - /** - * This function removes the destination for a particular endpoint. - */ - void removeDestination(EndpointInfo ei) - { - destinations.remove(ei.getAddress()); - } - -} Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java) =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java (rev 0) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -0,0 +1,118 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.cxf.addons.transports.httpserver; + +import java.io.IOException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import javax.annotation.PostConstruct; +import javax.annotation.Resource; + +import org.apache.cxf.Bus; +import org.apache.cxf.service.model.EndpointInfo; +import org.apache.cxf.transport.Destination; +import org.apache.cxf.transport.DestinationFactory; +import org.apache.cxf.transport.http.AbstractHTTPTransportFactory; + +/** + * A Destination/Transport factory for the JDK6 httpserver + * + * @author alessio.soldano(a)jboss.com + * @since 19-Aug-2010 + * + */ +public class HttpServerTransportFactory extends AbstractHTTPTransportFactory implements DestinationFactory +{ + private Map<String, HttpServerDestination> destinations = new ConcurrentHashMap<String, HttpServerDestination>(); + + public HttpServerTransportFactory() + { + super(); + } + + @Resource + public void setBus(Bus b) + { + super.setBus(b); + } + + @PostConstruct + public void finalizeConfig() + { + if (null == bus) + { + return; + } + // This call will register the server engine factory + // with the Bus. + getServerEngineFactory(); + } + + protected HttpServerEngineFactory getServerEngineFactory() + { + HttpServerEngineFactory serverEngineFactory = getBus().getExtension(HttpServerEngineFactory.class); + // If it's not there, then create it and register it. + // Spring may override it later, but we need it here for default + // with no spring configuration. + if (serverEngineFactory == null) + { + serverEngineFactory = new HttpServerEngineFactory(bus); + serverEngineFactory.setBus(getBus()); + } + return serverEngineFactory; + } + + public Destination getDestination(EndpointInfo endpointInfo) throws IOException + { + String addr = endpointInfo.getAddress(); + HttpServerDestination destination = addr == null ? null : destinations.get(addr); + if (destination == null) + { + destination = createDestination(endpointInfo); + } + return destination; + } + + private synchronized HttpServerDestination createDestination(EndpointInfo endpointInfo) throws IOException + { + String addr = endpointInfo.getAddress(); + HttpServerDestination destination = addr == null ? null : destinations.get(addr); + if (destination == null) + { + destination = new HttpServerDestination(getBus(), this, endpointInfo); + destinations.put(endpointInfo.getAddress(), destination); + configure(destination); + destination.finalizeConfig(); + } + return destination; + } + + /** + * This function removes the destination for a particular endpoint. + */ + void removeDestination(EndpointInfo ei) + { + destinations.remove(ei.getAddress()); + } + +} Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/resources) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/resources/META-INF) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf) Deleted: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml =================================================================== --- stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml 2010-08-25 08:57:14 UTC (rev 12849) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml 2010-08-25 16:43:11 UTC (rev 12864) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<extensions xmlns="http://cxf.apache.org/bus/extension"> - - <extension class="org.jboss.wsf.stack.cxf.addons.transports.httpserver.HttpServerTransportFactory" deferred="false"> - <namespace>http://cxf.apache.org/transports/http</namespace> - <namespace>http://cxf.apache.org/transports/http/configuration</name... - <namespace>http://schemas.xmlsoap.org/wsdl/http</namespace> - <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace> - </extension> -</extensions> Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml) =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml (rev 0) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml 2010-08-25 16:43:11 UTC (rev 12864) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<extensions xmlns="http://cxf.apache.org/bus/extension"> + + <extension class="org.jboss.wsf.stack.cxf.addons.transports.httpserver.HttpServerTransportFactory" deferred="false"> + <namespace>http://cxf.apache.org/transports/http</namespace> + <namespace>http://cxf.apache.org/transports/http/configuration</name... + <namespace>http://schemas.xmlsoap.org/wsdl/http</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace> + </extension> +</extensions> Deleted: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml =================================================================== --- stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml 2010-08-25 08:57:14 UTC (rev 12849) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml 2010-08-25 16:43:11 UTC (rev 12864) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" /> - - <bean class="org.jboss.wsf.stack.cxf.addons.transports.httpserver.HttpServerTransportFactory" - id="org.jboss.wsf.stack.cxf.addons.transports.httpserver.HttpServerTransportFactory" - lazy-init="true"> - <property name="bus" ref="cxf"/> - <property name="transportIds"> - <list> - <value>http://cxf.apache.org/transports/http</value> - <value>http://cxf.apache.org/transports/http/configuration</value> - <value>http://schemas.xmlsoap.org/wsdl/http</value> - <value>http://schemas.xmlsoap.org/wsdl/http/</value> - </list> - </property> - </bean> - -</beans> Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml) =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml (rev 0) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml 2010-08-25 16:43:11 UTC (rev 12864) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" /> + + <bean class="org.jboss.wsf.stack.cxf.addons.transports.httpserver.HttpServerTransportFactory" + id="org.jboss.wsf.stack.cxf.addons.transports.httpserver.HttpServerTransportFactory" + lazy-init="true"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <list> + <value>http://cxf.apache.org/transports/http</value> + <value>http://cxf.apache.org/transports/http/configuration</value> + <value>http://schemas.xmlsoap.org/wsdl/http</value> + <value>http://schemas.xmlsoap.org/wsdl/http/</value> + </list> + </property> + </bean> + +</beans> Deleted: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension =================================================================== --- stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension 2010-08-25 08:57:14 UTC (rev 12849) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension 2010-08-25 16:43:11 UTC (rev 12864) @@ -1 +0,0 @@ -META-INF/cxf/cxf-extension-httpserver.xml \ No newline at end of file Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension) =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension (rev 0) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension 2010-08-25 16:43:11 UTC (rev 12864) @@ -0,0 +1 @@ +META-INF/cxf/cxf-extension-httpserver.xml \ No newline at end of file Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/test) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/test/java) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/test/java/org) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/test/java/org/jboss) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports) Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver) Deleted: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java 2010-08-25 08:57:14 UTC (rev 12849) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -1,143 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.addons.transports.httpserver; - -import java.io.IOException; -import java.io.OutputStream; -import java.net.HttpURLConnection; -import java.net.URL; - -import junit.framework.TestCase; - -import org.apache.cxf.Bus; -import org.apache.cxf.configuration.Configurer; -import org.apache.cxf.configuration.spring.ConfigurerImpl; -import org.easymock.classextension.EasyMock; -import org.easymock.classextension.IMocksControl; - -/** - * Tests for HttpServerEngine - * - * @author alessio.soldano(a)jboss.com - * @since 20-Aug-2010 - * - */ -public class HttpServerEngineTest extends TestCase { - - private Bus bus; - private IMocksControl control; - private HttpServerEngineFactory factory; - - - public void setUp() throws Exception - { - control = EasyMock.createNiceControl(); - bus = control.createMock(Bus.class); - Configurer configurer = new ConfigurerImpl(); - bus.getExtension(Configurer.class); - EasyMock.expectLastCall().andReturn(configurer).anyTimes(); - } - - public void testEngineRetrieval() throws Exception - { - control.replay(); - factory = new HttpServerEngineFactory(bus); - HttpServerEngine engine = factory.createHttpServerEngine("localhost", 9234, "http"); - assertTrue(engine == factory.retrieveHttpServerEngine(9234)); - factory.destroyForPort(1234); - control.verify(); - } - - public void testHttpAndHttps() throws Exception - { - control.replay(); - factory = new HttpServerEngineFactory(bus); - HttpServerEngine engine = factory.createHttpServerEngine("localhost", 9234, "http"); - assertTrue("http".equals(engine.getProtocol())); - System.out.println("[JBWS-3079] FIXME: Add support for https protocol"); -// HttpServerEngine engine2 = factory.createHttpServerEngine("localhost", 9235, "https"); -// assertTrue("https".equals(engine2.getProtocol())); - factory.destroyForPort(9234); -// factory.destroyForPort(9235); - - control.verify(); - } - - public void testHandler() throws Exception - { - MyTestHandler handler1 = new MyTestHandler(); - MyTestHandler handler2 = new MyTestHandler(); - control.replay(); - factory = new HttpServerEngineFactory(bus); - String urlStr1 = "http://localhost:9234/hello/test"; - String urlStr2 = "http://localhost:9234/hello233/test"; - HttpServerEngine engine = factory.createHttpServerEngine("localhost", 9234, "http"); - engine.addHandler(urlStr1, handler1); - engine.addHandler(urlStr2, handler2); - pingServer(new URL(urlStr1)); - pingServer(new URL(urlStr2)); - assertEquals(1, handler1.count); - assertEquals(1, handler2.count); - engine.removeHandler(urlStr1); - engine.removeHandler(urlStr2); - engine.shutdown(); - factory.destroyForPort(9234); - - control.verify(); - } - - private void pingServer(URL url) - { - try - { - HttpURLConnection connection1 = (HttpURLConnection) url.openConnection(); - connection1.getInputStream(); - connection1.disconnect(); - } - catch (IOException e) - { - throw new RuntimeException(e); - } - } - - @SuppressWarnings("restriction") - private class MyTestHandler implements com.sun.net.httpserver.HttpHandler - { - volatile int count; - - public MyTestHandler() - { - - } - - @Override - public void handle(com.sun.net.httpserver.HttpExchange exchange) throws IOException { - count++; - exchange.sendResponseHeaders(200, 0); - OutputStream os = exchange.getResponseBody(); - os.write("Hello".getBytes()); - os.flush(); - exchange.close(); - } - } - -} Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java) =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java (rev 0) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -0,0 +1,143 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.cxf.addons.transports.httpserver; + +import java.io.IOException; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.URL; + +import junit.framework.TestCase; + +import org.apache.cxf.Bus; +import org.apache.cxf.configuration.Configurer; +import org.apache.cxf.configuration.spring.ConfigurerImpl; +import org.easymock.classextension.EasyMock; +import org.easymock.classextension.IMocksControl; + +/** + * Tests for HttpServerEngine + * + * @author alessio.soldano(a)jboss.com + * @since 20-Aug-2010 + * + */ +public class HttpServerEngineTest extends TestCase { + + private Bus bus; + private IMocksControl control; + private HttpServerEngineFactory factory; + + + public void setUp() throws Exception + { + control = EasyMock.createNiceControl(); + bus = control.createMock(Bus.class); + Configurer configurer = new ConfigurerImpl(); + bus.getExtension(Configurer.class); + EasyMock.expectLastCall().andReturn(configurer).anyTimes(); + } + + public void testEngineRetrieval() throws Exception + { + control.replay(); + factory = new HttpServerEngineFactory(bus); + HttpServerEngine engine = factory.createHttpServerEngine("localhost", 9234, "http"); + assertTrue(engine == factory.retrieveHttpServerEngine(9234)); + factory.destroyForPort(1234); + control.verify(); + } + + public void testHttpAndHttps() throws Exception + { + control.replay(); + factory = new HttpServerEngineFactory(bus); + HttpServerEngine engine = factory.createHttpServerEngine("localhost", 9234, "http"); + assertTrue("http".equals(engine.getProtocol())); + System.out.println("[JBWS-3079] FIXME: Add support for https protocol"); +// HttpServerEngine engine2 = factory.createHttpServerEngine("localhost", 9235, "https"); +// assertTrue("https".equals(engine2.getProtocol())); + factory.destroyForPort(9234); +// factory.destroyForPort(9235); + + control.verify(); + } + + public void testHandler() throws Exception + { + MyTestHandler handler1 = new MyTestHandler(); + MyTestHandler handler2 = new MyTestHandler(); + control.replay(); + factory = new HttpServerEngineFactory(bus); + String urlStr1 = "http://localhost:9234/hello/test"; + String urlStr2 = "http://localhost:9234/hello233/test"; + HttpServerEngine engine = factory.createHttpServerEngine("localhost", 9234, "http"); + engine.addHandler(urlStr1, handler1); + engine.addHandler(urlStr2, handler2); + pingServer(new URL(urlStr1)); + pingServer(new URL(urlStr2)); + assertEquals(1, handler1.count); + assertEquals(1, handler2.count); + engine.removeHandler(urlStr1); + engine.removeHandler(urlStr2); + engine.shutdown(); + factory.destroyForPort(9234); + + control.verify(); + } + + private void pingServer(URL url) + { + try + { + HttpURLConnection connection1 = (HttpURLConnection) url.openConnection(); + connection1.getInputStream(); + connection1.disconnect(); + } + catch (IOException e) + { + throw new RuntimeException(e); + } + } + + @SuppressWarnings("restriction") + private class MyTestHandler implements com.sun.net.httpserver.HttpHandler + { + volatile int count; + + public MyTestHandler() + { + + } + + @Override + public void handle(com.sun.net.httpserver.HttpExchange exchange) throws IOException { + count++; + exchange.sendResponseHeaders(200, 0); + OutputStream os = exchange.getResponseBody(); + os.write("Hello".getBytes()); + os.flush(); + exchange.close(); + } + } + +} Copied: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/resources (from rev 12849, stack/cxf/branches/cxf-2.3/modules/addons/transports/http/httpserver/src/test/resources) Modified: stack/cxf/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/trunk/modules/client/pom.xml 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/client/pom.xml 2010-08-25 16:43:11 UTC (rev 12864) @@ -29,6 +29,11 @@ <artifactId>jbossws-cxf-factories</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-transports-httpserver</artifactId> + <version>${project.version}</version> + </dependency> <!-- CXF dependencies --> <dependency> @@ -58,10 +63,6 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http-jetty</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-jms</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -22,8 +22,10 @@ package org.jboss.wsf.stack.cxf.client.configuration; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; +import java.util.List; import java.util.Map; import javax.xml.bind.JAXBException; @@ -32,6 +34,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.bus.CXFBusFactory; import org.apache.cxf.bus.extension.ExtensionManagerBus; +import org.apache.cxf.configuration.ConfiguredBeanLocator; import org.apache.cxf.configuration.Configurer; import org.apache.cxf.ws.addressing.Names; import org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder; @@ -75,6 +78,8 @@ extensions.put(Configurer.class, new JBossWSNonSpringConfigurer(new BeanCustomizer())); } + extensions.put(ConfiguredBeanLocator.class, new DummyBeanLocator()); + preparePolicyEngine(extensions); Bus bus = new ExtensionManagerBus(extensions, properties); @@ -98,11 +103,8 @@ private static void initPolicyEngine(PolicyEngineImpl engine, Bus bus) { engine.setBus(bus); - engine.addBusInterceptors(); //required for Apache CXF 2.2.x only, this is automatically done in setBus(..) starting from 2.3 - AssertionBuilderRegistry assertionBuilderRegistry = new AssertionBuilderRegistryImpl(); - bus.setExtension(assertionBuilderRegistry, AssertionBuilderRegistry.class); - PolicyInterceptorProviderRegistry policyInterceptorProviderRegistry = new PolicyInterceptorProviderRegistryImpl(); - bus.setExtension(policyInterceptorProviderRegistry, PolicyInterceptorProviderRegistry.class); + AssertionBuilderRegistry assertionBuilderRegistry = new AssertionBuilderRegistryImpl(bus); + PolicyInterceptorProviderRegistry policyInterceptorProviderRegistry = new PolicyInterceptorProviderRegistryImpl(bus); PolicyBuilderImpl policyBuilder = new PolicyBuilderImpl(); policyBuilder.setBus(bus); policyBuilder.setAssertionBuilderRegistry(assertionBuilderRegistry); @@ -123,7 +125,6 @@ //RM RMManager rmManager = new RMManager(); - bus.setExtension(rmManager, RMManager.class); rmManager.init(bus); //RM Policy @@ -153,4 +154,39 @@ protected void initializeBus(Bus bus) { super.initializeBus(bus); } + + private class DummyBeanLocator implements ConfiguredBeanLocator + { + + @Override + public List<String> getBeanNamesOfType(Class<?> type) + { + return Collections.emptyList(); + } + + @Override + public <T> Collection<? extends T> getBeansOfType(Class<T> type) + { + return Collections.emptyList(); + } + + @Override + public <T> T getBeanOfType(String name, Class<T> type) + { + return null; + } + + @Override + public <T> boolean loadBeansOfType(Class<T> type, BeanLoaderListener<T> listener) + { + return false; + } + + @Override + public boolean hasConfiguredPropertyValue(String beanName, String propertyName, String value) + { + return false; + } + + } } Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jbossws.xml =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jbossws.xml 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jbossws.xml 2010-08-25 16:43:11 UTC (rev 12864) @@ -17,4 +17,5 @@ </cxf:inFaultInterceptors> </cxf:bus> --> + </beans> \ No newline at end of file Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2010-08-25 16:43:11 UTC (rev 12864) @@ -52,82 +52,90 @@ </property> </bean> - <bean id="org.apache.cxf.binding.BindingFactoryManager" class="org.apache.cxf.binding.BindingFactoryManagerImpl"> - <property name="mapProvider"> - <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> - <property name="type" value="org.apache.cxf.binding.BindingFactory"/> - <property name="idsProperty" value="activationNamespaces"/> - </bean> - </property> - <property name="bus" ref="cxf"/> + <bean id="org.apache.cxf.binding.BindingFactoryManager" + class="org.apache.cxf.binding.BindingFactoryManagerImpl" + lazy-init="true"> + <constructor-arg ref="cxf"/> </bean> - <bean id="org.apache.cxf.transport.DestinationFactoryManager" class="org.apache.cxf.transport.DestinationFactoryManagerImpl"> - <property name="mapProvider"> - <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> - <property name="type" value="org.apache.cxf.transport.DestinationFactory"/> - <property name="idsProperty" value="transportIds"/> - </bean> - </property> - <property name="bus" ref="cxf"/> + <bean id="org.apache.cxf.transport.DestinationFactoryManager" + class="org.apache.cxf.transport.DestinationFactoryManagerImpl" + lazy-init="true"> + <constructor-arg ref="cxf"/> </bean> - <bean id="org.apache.cxf.transport.ConduitInitiatorManager" class="org.apache.cxf.transport.ConduitInitiatorManagerImpl"> - <property name="mapProvider"> - <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> - <property name="type" value="org.apache.cxf.transport.ConduitInitiator"/> - <property name="idsProperty" value="transportIds"/> - </bean> - </property> - <property name="bus" ref="cxf"/> + <bean id="org.apache.cxf.transport.ConduitInitiatorManager" + class="org.apache.cxf.transport.ConduitInitiatorManagerImpl" + lazy-init="true"> + <constructor-arg ref="cxf"/> </bean> - <bean id="org.apache.cxf.wsdl.WSDLManager" class="org.apache.cxf.wsdl11.WSDLManagerImpl"> - <property name="bus" ref="cxf"/> + <bean id="org.apache.cxf.wsdl.WSDLManager" + class="org.apache.cxf.wsdl11.WSDLManagerImpl" + lazy-init="true"> + <constructor-arg ref="cxf"/> </bean> - <bean id="org.apache.cxf.phase.PhaseManager" class="org.apache.cxf.phase.PhaseManagerImpl"> - - </bean> + <bean id="org.apache.cxf.phase.PhaseManager" + class="org.apache.cxf.phase.PhaseManagerImpl" + lazy-init="true"/> - <bean id="org.apache.cxf.workqueue.WorkQueueManager" class="org.apache.cxf.workqueue.WorkQueueManagerImpl"> - <property name="bus" ref="cxf"/> + <bean id="org.apache.cxf.workqueue.WorkQueueManager" + class="org.apache.cxf.workqueue.WorkQueueManagerImpl" + lazy-init="true"> + <constructor-arg ref="cxf"/> </bean> - <bean id="org.apache.cxf.buslifecycle.BusLifeCycleManager" class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager"> - <property name="bus" ref="cxf"/> + <bean id="org.apache.cxf.buslifecycle.BusLifeCycleManager" + class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager" + lazy-init="true"> + <constructor-arg ref="cxf"/> </bean> - <bean id="org.apache.cxf.endpoint.ServerRegistry" class="org.apache.cxf.endpoint.ServerRegistryImpl"> - <property name="bus" ref="cxf"/> + <bean id="org.apache.cxf.endpoint.ServerRegistry" + class="org.apache.cxf.endpoint.ServerRegistryImpl" + lazy-init="true"> + <constructor-arg ref="cxf"/> </bean> - <bean id="org.apache.cxf.endpoint.ServerLifeCycleManager" class="org.apache.cxf.endpoint.ServerLifeCycleManagerImpl"/> - <bean id="org.apache.cxf.endpoint.ClientLifeCycleManager" class="org.apache.cxf.endpoint.ClientLifeCycleManagerImpl"/> + <bean id="org.apache.cxf.endpoint.ServerLifeCycleManager" + class="org.apache.cxf.endpoint.ServerLifeCycleManagerImpl" + lazy-init="true"/> + <bean id="org.apache.cxf.endpoint.ClientLifeCycleManager" + class="org.apache.cxf.endpoint.ClientLifeCycleManagerImpl" + lazy-init="true"/> - <bean id="org.apache.cxf.transports.http.QueryHandlerRegistry" class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl"> - <property name="bus" ref="cxf"/> - <property name="queryHandlers"> - <list> - <bean class="org.apache.cxf.transport.http.WSDLQueryHandler"> - <property name="bus" ref="cxf"/> - </bean> - </list> - </property> + <bean id="org.apache.cxf.transports.http.QueryHandlerRegistry" + class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl" + lazy-init="true"> + <constructor-arg ref="cxf"/> </bean> - <bean id="org.apache.cxf.endpoint.EndpointResolverRegistry" class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl"> - <property name="bus" ref="cxf"/> + <bean id="org.apache.cxf.endpoint.EndpointResolverRegistry" + class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl" + lazy-init="true"> + <constructor-arg ref="cxf"/> </bean> - <bean id="org.apache.cxf.headers.HeaderManager" class="org.apache.cxf.headers.HeaderManagerImpl"> - <property name="bus" ref="cxf"/> + <bean id="org.apache.cxf.headers.HeaderManager" + class="org.apache.cxf.headers.HeaderManagerImpl" + lazy-init="true"> + <constructor-arg ref="cxf"/> </bean> - <bean id="org.apache.cxf.catalog.OASISCatalogManager" class="org.apache.cxf.catalog.OASISCatalogManager"> - <property name="bus" ref="cxf"/> + <bean id="org.apache.cxf.catalog.OASISCatalogManager" + class="org.apache.cxf.catalog.OASISCatalogManager" + lazy-init="true"> + <constructor-arg ref="cxf"/> </bean> - - <bean id="org.apache.cxf.endpoint.ServiceContractResolverRegistry" class="org.apache.cxf.endpoint.ServiceContractResolverRegistryImpl"> - <property name="bus" ref="cxf"/> + <bean id="org.apache.cxf.service.factory.FactoryBeanListenerManager" + class="org.apache.cxf.service.factory.FactoryBeanListenerManager" + lazy-init="true"> + <constructor-arg ref="cxf"/> </bean> + + <bean id="org.apache.cxf.endpoint.ServiceContractResolverRegistry" + class="org.apache.cxf.endpoint.ServiceContractResolverRegistryImpl" + lazy-init="true"> + <constructor-arg ref="cxf"/> + </bean> </beans> Modified: stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider =================================================================== --- stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2010-08-25 16:43:11 UTC (rev 12864) @@ -1 +1 @@ -org.apache.cxf.jaxws.spi.ProviderImpl +org.apache.cxf.jaxws22.spi.ProviderImpl Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-08-25 16:43:11 UTC (rev 12864) @@ -61,7 +61,6 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-jms.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-local.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http-jetty.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-addr.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-policy.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-rm.jar Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-08-25 16:43:11 UTC (rev 12864) @@ -100,7 +100,6 @@ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-transports-jms.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-transports-local.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-transports-http.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-transports-http-jetty.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-ws-addr.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-ws-policy.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-ws-rm.jar" Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-08-25 16:43:11 UTC (rev 12864) @@ -59,7 +59,6 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-javascript.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-management.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http-jetty.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-jms.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-local.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-addr.jar Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-08-25 16:43:11 UTC (rev 12864) @@ -101,7 +101,6 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-javascript.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-management.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-transports-http.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-transports-http-jetty.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-transports-jms.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-transports-local.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-ws-addr.jar" Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-08-25 16:43:11 UTC (rev 12864) @@ -80,7 +80,6 @@ set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-javascript.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-management.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http-jetty.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-jms.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-local.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-addr.jar Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-08-25 16:43:11 UTC (rev 12864) @@ -100,7 +100,6 @@ WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/cxf-rt-javascript.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/cxf-rt-management.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/cxf-rt-transports-http.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/cxf-rt-transports-http-jetty.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/cxf-rt-transports-jms.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/cxf-rt-transports-local.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/cxf-rt-ws-addr.jar" Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-08-25 16:43:11 UTC (rev 12864) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/wscommons-policy.ja! r client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-cxf-* lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/jaxws-httpserver-httpspi.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossw! s-spi.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/jaxws-httpserver-httpspi.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-cxf-* lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-08-25 16:43:11 UTC (rev 12864) @@ -34,13 +34,14 @@ <include name="**/jaxb-xjc.jar"/> <include name="**/jaxrpc-api.jar"/> <include name="**/jaxws-api.jar"/> + <include name="**/jaxws-httpserver-httpspi.jar"/> <include name="**/jsr181-api.jar"/> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-cxf-client*.jar"/> <include name="**/jbossws-framework.jar"/> <include name="**/jbossws-spi.jar"/> + <include name="**/jbossws-cxf-transports-httpserver.jar"/> <include name="**/jdom.jar"/> - <include name="**/jetty*.jar"/> <include name="**/neethi.jar"/> <include name="**/saaj-api.jar"/> <include name="**/stax-api.jar"/> @@ -72,6 +73,7 @@ <include name="**/FastInfoset.jar"/> <include name="**/jaxrpc-api.jar"/> <include name="**/jaxws-api.jar"/> + <include name="**/jaxws-httpserver-httpspi.jar"/> <include name="**/jsr181-api.jar"/> <include name="**/jboss-jaxb-intros.jar"/> <include name="**/jbossws-common.jar"/> @@ -87,6 +89,7 @@ </patternset> <patternset id="jbossws.service.lib.patternset"> + <include name="**/jbossws-cxf-transports-httpserver.jar"/> <include name="**/jbossws-cxf-client*.jar"/> <include name="**/jbossws-cxf-factories.jar"/> <include name="**/jbossws-cxf-server*.jar"/> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/server/pom.xml 2010-08-25 16:43:11 UTC (rev 12864) @@ -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> @@ -67,11 +67,11 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> + <artifactId>cxf-rt-management</artifactId> </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http-jetty</artifactId> + <artifactId>cxf-rt-transports-http</artifactId> </dependency> <dependency> <groupId>org.apache.cxf</groupId> Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -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/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -64,7 +64,7 @@ super(); this.metadata = metadata; bus = new JBossWSNonSpringBusFactory().createBus(); - //Force servlet transport to prevent CXF from using Jetty as a transport + //Force servlet transport to prevent CXF from using Jetty or other transports ExtensionManager em = bus.getExtension(ExtensionManager.class); em.activateAllByType(ConduitInitiator.class); //need to activate/register all the beans implementing ConduitInitiator so that does not happen later DestinationFactory factory = new ServletTransportFactory(bus); Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -95,7 +95,7 @@ log.trace("Could not load additional config from location: " + location, e); } } - //Force servlet transport to prevent CXF from using Jetty as a transport + //Force servlet transport to prevent CXF from using Jetty or other transports DestinationFactory factory = new ServletTransportFactory(bus); for (String s : factory.getTransportIds()) { Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -41,7 +41,7 @@ * @since 01-Apr-2010 * */ -public class EndpointImpl extends org.apache.cxf.jaxws.EndpointImpl +public class EndpointImpl extends org.apache.cxf.jaxws22.EndpointImpl { private WSDLFilePublisher wsdlPublisher; Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -49,63 +49,74 @@ */ public class BusDeploymentAspect extends AbstractDeploymentAspect { + @SuppressWarnings("unchecked") @Override public void start(Deployment dep) { - ClassLoader origClassLoader = SecurityActions.getContextClassLoader(); - try + //synchronize as this assumes nothing deals with the BusFactory threadlocals associated with the system daemon + //thread doing the deployments, iow multiple concurrent deployment are not supported in this deployment aspect + synchronized (this) { - ArchiveDeployment aDep = (ArchiveDeployment)dep; - //set the runtime classloader (pointing to the deployment unit) to allow CXF accessing to the classes - SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader()); - - ResourceResolver deploymentResolver = aDep.getResourceResolver(); - org.apache.cxf.resource.ResourceResolver resolver = new JBossWSResourceResolver(deploymentResolver); - Map<String, String> contextParams = (Map<String, String>)dep.getProperty(WSConstants.STACK_CONTEXT_PARAMS); - String jbosswsCxfXml = contextParams == null ? null : contextParams.get(BusHolder.PARAM_CXF_BEANS_URL); - BusHolder holder = null; - - if (jbosswsCxfXml != null) // Spring available + ClassLoader origClassLoader = SecurityActions.getContextClassLoader(); + try { - URL cxfServletURL = null; - try + //start cleaning the BusFactory thread locals + BusFactory.setDefaultBus(null); + BusFactory.setThreadDefaultBus(null); + + ArchiveDeployment aDep = (ArchiveDeployment) dep; + //set the runtime classloader (pointing to the deployment unit) to allow CXF accessing to the classes + SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader()); + + ResourceResolver deploymentResolver = aDep.getResourceResolver(); + org.apache.cxf.resource.ResourceResolver resolver = new JBossWSResourceResolver(deploymentResolver); + Map<String, String> contextParams = (Map<String, String>) dep.getProperty(WSConstants.STACK_CONTEXT_PARAMS); + String jbosswsCxfXml = contextParams == null ? null : contextParams.get(BusHolder.PARAM_CXF_BEANS_URL); + BusHolder holder = null; + + if (jbosswsCxfXml != null) // Spring available { - cxfServletURL = deploymentResolver.resolve("WEB-INF/cxf-servlet.xml"); + URL cxfServletURL = null; + try + { + cxfServletURL = deploymentResolver.resolve("WEB-INF/cxf-servlet.xml"); + } + catch (IOException e) + { + } //ignore, cxf-servlet.xml is optional, we might even decide not to support this + + try + { + holder = new SpringBusHolder(cxfServletURL, deploymentResolver.resolve(jbosswsCxfXml)); + Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), + new WSDLFilePublisher(aDep), dep.getService().getEndpoints()); + holder.configure(new SoapTransportFactoryExt(), resolver, configurer); + } + catch (Exception e) + { + throw new RuntimeException(e); //re-throw, jboss-cxf.xml is required + } } - catch (IOException e) + else + //Spring not available { - } //ignore, cxf-servlet.xml is optional, we might even decide not to support this - - try - { - holder = new SpringBusHolder(cxfServletURL, deploymentResolver.resolve(jbosswsCxfXml)); - Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep), - dep.getService().getEndpoints()); + DDBeans metadata = dep.getAttachment(DDBeans.class); + holder = new NonSpringBusHolder(metadata); + Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), + new WSDLFilePublisher(aDep), dep.getService().getEndpoints()); holder.configure(new SoapTransportFactoryExt(), resolver, configurer); } - catch (Exception e) - { - throw new RuntimeException(e); //re-throw, jboss-cxf.xml is required - } + dep.addAttachment(BusHolder.class, holder); } - else //Spring not available + finally { - DDBeans metadata = dep.getAttachment(DDBeans.class); - holder = new NonSpringBusHolder(metadata); - Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep), - dep.getService().getEndpoints()); - holder.configure(new SoapTransportFactoryExt(), resolver, configurer); + //clean threadlocals in BusFactory and restore the original classloader + BusFactory.setDefaultBus(null); + BusFactory.setThreadDefaultBus(null); + SecurityActions.setContextClassLoader(origClassLoader); } - dep.addAttachment(BusHolder.class, holder); } - finally - { - //clean threadlocals in BusFactory and restore the original classloader - BusFactory.setDefaultBus(null); - BusFactory.setThreadDefaultBus(null); - SecurityActions.setContextClassLoader(origClassLoader); - } } @Override Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -1,55 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.transport; - -import java.io.IOException; -import java.util.logging.Logger; - -import org.apache.cxf.Bus; -import org.apache.cxf.common.logging.LogUtils; -import org.apache.cxf.service.model.EndpointInfo; -import org.apache.cxf.transport.http.AbstractHTTPDestination; - -public class TomcatHTTPDestination extends AbstractHTTPDestination -{ - private static final Logger LOG = LogUtils.getL7dLogger(TomcatHTTPDestination.class); - - private TomcatHTTPTransportFactory transportFactory; - - public TomcatHTTPDestination(Bus b, TomcatHTTPTransportFactory ci, EndpointInfo ei, boolean dp) throws IOException - { - super(b, ci, ei, dp); - this.transportFactory = ci; - } - - @Override - protected Logger getLogger() - { - return LOG; - } - - @Override - public void shutdown() { - transportFactory.removeDestination(endpointInfo); - super.shutdown(); - } -} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java 2010-08-25 16:43:11 UTC (rev 12864) @@ -1,76 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.transport; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import org.apache.cxf.service.model.EndpointInfo; -import org.apache.cxf.transport.Destination; -import org.apache.cxf.transport.DestinationFactory; -import org.apache.cxf.transport.http.AbstractHTTPTransportFactory; - -public class TomcatHTTPTransportFactory extends AbstractHTTPTransportFactory implements DestinationFactory -{ - private Map<String, TomcatHTTPDestination> destinations = new HashMap<String, TomcatHTTPDestination>(); - - public TomcatHTTPTransportFactory() - { - super(); - } - - public Destination getDestination(EndpointInfo endpointInfo) throws IOException - { - String addr = endpointInfo.getAddress(); - TomcatHTTPDestination destination = destinations.get(addr); - if (destination == null) - { - destination = createDestination(endpointInfo); - } - - return destination; - } - - private synchronized TomcatHTTPDestination createDestination(EndpointInfo endpointInfo) throws IOException - { - - TomcatHTTPDestination destination = destinations.get(endpointInfo.getAddress()); - if (destination == null) - { - destination = new TomcatHTTPDestination(getBus(), this, endpointInfo, true); - - destinations.put(endpointInfo.getAddress(), destination); - - configure(destination); - } - return destination; - } - - /** - * This function removes the destination for a particular endpoint. - */ - void removeDestination(EndpointInfo ei) - { - destinations.remove(ei.getAddress()); - } -} Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-08-25 16:43:11 UTC (rev 12864) @@ -42,7 +42,6 @@ org/jboss/test/ws/jaxrpc/** # [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack -org/jboss/test/ws/jaxws/endpoint/** org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws2991/** org/jboss/test/ws/jaxws/jbws3008/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-08-25 16:43:11 UTC (rev 12864) @@ -42,7 +42,6 @@ org/jboss/test/ws/jaxrpc/** # [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack -org/jboss/test/ws/jaxws/endpoint/** org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws2991/** org/jboss/test/ws/jaxws/jbws3008/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-08-25 16:43:11 UTC (rev 12864) @@ -33,7 +33,6 @@ org/jboss/test/ws/jaxws/jbws1797/** # [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack -org/jboss/test/ws/jaxws/endpoint/** org/jboss/test/ws/jaxws/jbws2937/** org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/jbws2960/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-08-25 16:43:11 UTC (rev 12864) @@ -33,7 +33,6 @@ org/jboss/test/ws/jaxws/jbws1797/** # [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack -org/jboss/test/ws/jaxws/endpoint/** org/jboss/test/ws/jaxws/jbws2937/** org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/jbws2960/** Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/pom.xml 2010-08-25 16:43:11 UTC (rev 12864) @@ -41,6 +41,7 @@ <module>modules/endorsed</module> <module>modules/management</module> <module>modules/resources</module> + <module>modules/addons</module> </modules> <!-- Properties --> @@ -57,7 +58,7 @@ <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version> --> <!-- END --> - <cxf.version>2.2.10</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> @@ -67,6 +68,7 @@ <jboss.security.sx.version>2.0.4</jboss.security.sx.version> <jboss.xb.version>2.0.2.Beta7</jboss.xb.version> <picketbox.version>3.0.0.Beta5</picketbox.version> + <jaxws-httpserver-httpspi.version>1.0.0-SNAPSHOT</jaxws-httpserver-httpspi.version> <jaxb.api.version>1.0.0.Beta1</jaxb.api.version> <jaxb.impl.version>2.2</jaxb.impl.version> <jaxrpc.api.version>1.1</jaxrpc.api.version> @@ -170,6 +172,11 @@ </dependency> --> <!-- END --> + <dependency> + <groupId>org.jboss.ws.projects</groupId> + <artifactId>jaxws-httpserver-httpspi</artifactId> + <version>${jaxws-httpserver-httpspi.version}</version> + </dependency> <!-- provided apis --> <dependency> @@ -312,6 +319,10 @@ </exclusion> <exclusion> <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-javamail_1.4_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jaxws_2.1_spec</artifactId> </exclusion> <exclusion> @@ -354,14 +365,10 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> + <artifactId>cxf-rt-management</artifactId> <version>${cxf.version}</version> <exclusions> <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-javamail_1.4_spec</artifactId> - </exclusion> - <exclusion> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> </exclusion> @@ -390,25 +397,21 @@ <artifactId>spring-tx</artifactId> </exclusion> <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http-jetty</artifactId> + <artifactId>cxf-rt-transports-http</artifactId> <version>${cxf.version}</version> <exclusions> <exclusion> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> + <artifactId>geronimo-javamail_1.4_spec</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - </exclusion> - <exclusion> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> </exclusion> @@ -1044,9 +1047,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 --> @@ -1169,6 +1172,11 @@ <artifactId>jboss-jms-api_1.1_spec</artifactId> <version>${jms.api.version}</version> </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymockclassextension</artifactId> + <version>2.4</version> + </dependency> </dependencies> </dependencyManagement> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-08-25 13:47:14 UTC (rev 12863) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-08-25 16:43:11 UTC (rev 12864) @@ -23,6 +23,8 @@ <useStrictFiltering>true</useStrictFiltering> <includes> <include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include> + <include>org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar</include> + <include>org.jboss.ws.projects:jaxws-httpserver-httpspi:jar</include> <include>org.apache.cxf:cxf-*</include> <include>org.apache.cxf.xjcplugins:cxf-*</include> <include>com.sun.xml.bind:jaxb-impl:jar</include> @@ -43,7 +45,6 @@ <include>commons-beanutils:commons-beanutils:jar</include> <include>commons-lang:commons-lang:jar</include> <include>jboss.jaxbintros:jboss-jaxb-intros</include> - <include>org.mortbay.jetty:jetty*</include> <include>stax:stax-api:jar</include> <include>javax.jws:jsr181-api:jar</include> </includes>