Author: richard.opalka(a)jboss.com Date: 2010-12-06 11:37:13 -0500 (Mon, 06 Dec 2010) New Revision: 13426 Added: stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/pom.xml stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/transports/http/httpserver/pom.xml stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/pom.xml stack/cxf/branches/jbossws-cxf-3.4.1/modules/endorsed/pom.xml stack/cxf/branches/jbossws-cxf-3.4.1/modules/management/pom.xml stack/cxf/branches/jbossws-cxf-3.4.1/modules/resources/pom.xml stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/pom.xml stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-tests/pom.xml stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/framework-tests/pom.xml stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml stack/cxf/branches/jbossws-cxf-3.4.1/src/main/scripts/assembly-deploy-artifacts.xml Log: prepare for next dev. cycle Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/pom.xml 2010-12-06 16:31:04 UTC (rev 13425) +++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/pom.xml 2010-12-06 16:37:13 UTC (rev 13426) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>3.4.1.CR1</version> + <version>3.4.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/transports/http/httpserver/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/transports/http/httpserver/pom.xml 2010-12-06 16:31:04 UTC (rev 13425) +++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/transports/http/httpserver/pom.xml 2010-12-06 16:37:13 UTC (rev 13426) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-addons</artifactId> - <version>3.4.1.CR1</version> + <version>3.4.1-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/pom.xml 2010-12-06 16:31:04 UTC (rev 13425) +++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/pom.xml 2010-12-06 16:37:13 UTC (rev 13426) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>3.4.1.CR1</version> + <version>3.4.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Copied: stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory (from rev 13420, stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory) =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory 2010-12-06 16:37:13 UTC (rev 13426) @@ -0,0 +1 @@ +org.jboss.wsf.stack.cxf.saaj.SOAPConnectionFactoryImpl Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/endorsed/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.1/modules/endorsed/pom.xml 2010-12-06 16:31:04 UTC (rev 13425) +++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/endorsed/pom.xml 2010-12-06 16:37:13 UTC (rev 13426) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>3.4.1.CR1</version> + <version>3.4.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/management/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.1/modules/management/pom.xml 2010-12-06 16:31:04 UTC (rev 13425) +++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/management/pom.xml 2010-12-06 16:37:13 UTC (rev 13426) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>3.4.1.CR1</version> + <version>3.4.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -46,6 +46,11 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501-metadata</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss510</artifactId> <scope>provided</scope> <exclusions> @@ -59,6 +64,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510-metadata</artifactId> + <scope>provided</scope> + </dependency> <!-- [JBWS-2505] --> <!-- START --> <!-- Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/resources/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.1/modules/resources/pom.xml 2010-12-06 16:31:04 UTC (rev 13425) +++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/resources/pom.xml 2010-12-06 16:37:13 UTC (rev 13426) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>3.4.1.CR1</version> + <version>3.4.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/pom.xml 2010-12-06 16:31:04 UTC (rev 13425) +++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/pom.xml 2010-12-06 16:37:13 UTC (rev 13426) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>3.4.1.CR1</version> + <version>3.4.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-12-06 16:31:04 UTC (rev 13425) +++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-12-06 16:37:13 UTC (rev 13426) @@ -35,6 +35,7 @@ import org.apache.cxf.transport.ConduitInitiator; import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.transport.servlet.ServletTransportFactory; +import org.apache.cxf.ws.addressing.WSAddressingFeature; import org.apache.cxf.ws.rm.RMManager; import org.jboss.wsf.spi.binding.BindingCustomization; import org.jboss.wsf.spi.deployment.Endpoint; @@ -101,6 +102,13 @@ endpoint.setServiceName(dde.getServiceName()); endpoint.setWsdlLocation(dde.getWsdlLocation()); setHandlers(endpoint, dde.getHandlers()); + if (dde.isAddressingEnabled()) + { + WSAddressingFeature addressingFeature = new WSAddressingFeature(); + addressingFeature.setAddressingRequired(dde.isAddressingRequired()); + addressingFeature.setResponses(dde.getAddressingResponses()); + endpoint.getFeatures().add(addressingFeature); + } endpoint.publish(); endpoints.add(endpoint); if (dde.isMtomEnabled()) Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/pom.xml 2010-12-06 16:31:04 UTC (rev 13425) +++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/pom.xml 2010-12-06 16:37:13 UTC (rev 13426) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>3.4.1.CR1</version> + <version>3.4.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-tests/pom.xml 2010-12-06 16:31:04 UTC (rev 13425) +++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-tests/pom.xml 2010-12-06 16:37:13 UTC (rev 13426) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>3.4.1.CR1</version> + <version>3.4.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/framework-tests/pom.xml 2010-12-06 16:31:04 UTC (rev 13425) +++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/framework-tests/pom.xml 2010-12-06 16:37:13 UTC (rev 13426) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>3.4.1.CR1</version> + <version>3.4.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/pom.xml 2010-12-06 16:31:04 UTC (rev 13425) +++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/pom.xml 2010-12-06 16:37:13 UTC (rev 13426) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>3.4.1.CR1</version> + <version>3.4.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml 2010-12-06 16:31:04 UTC (rev 13425) +++ stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml 2010-12-06 16:37:13 UTC (rev 13426) @@ -18,7 +18,7 @@ <packaging>pom</packaging> <description>JBossWS CXF stack</description> - <version>3.4.1.CR1</version> + <version>3.4.1-SNAPSHOT</version> <!-- Parent --> <parent> @@ -29,9 +29,9 @@ <!-- Source Control Management --> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/ta... - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/... - <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cx... + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tr... + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/... + <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/trunk</url> </scm> <!-- Modules --> @@ -46,11 +46,11 @@ <!-- Properties --> <properties> - <jbossws.spi.version>1.4.1.CR4</jbossws.spi.version> - <jbossws.common.version>1.4.1.CR4</jbossws.common.version> - <jbossws.framework.version>3.4.1.CR1</jbossws.framework.version> - <jbossws.jboss501.version>3.4.0.Beta2</jbossws.jboss501.version> - <jbossws.jboss510.version>3.4.0.Beta2</jbossws.jboss510.version> + <jbossws.spi.version>1.4.1-SNAPSHOT</jbossws.spi.version> + <jbossws.common.version>1.4.1-SNAPSHOT</jbossws.common.version> + <jbossws.framework.version>3.4.1-SNAPSHOT</jbossws.framework.version> + <jbossws.jboss501.version>3.4.1-SNAPSHOT</jbossws.jboss501.version> + <jbossws.jboss510.version>3.4.1-SNAPSHOT</jbossws.jboss510.version> <!-- JBWS-2505 --> <!-- START --> <!-- @@ -58,7 +58,7 @@ <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version> --> <!-- END --> - <cxf.version>2.3.0</cxf.version> + <cxf.version>2.3.1-SNAPSHOT</cxf.version> <cxf.stax.version>1.0.1</cxf.stax.version> <cxf.asm.version>2.2.3</cxf.asm.version> <cxf.xjcplugins.version>2.3.0</cxf.xjcplugins.version> @@ -127,6 +127,11 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501-metadata</artifactId> + <version>${jbossws.jboss501.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501</artifactId> <version>${jbossws.jboss501.version}</version> <classifier>resources</classifier> @@ -139,6 +144,11 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510-metadata</artifactId> + <version>${jbossws.jboss510.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss510</artifactId> <version>${jbossws.jboss510.version}</version> <classifier>resources</classifier> Modified: stack/cxf/branches/jbossws-cxf-3.4.1/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.1/src/main/scripts/assembly-deploy-artifacts.xml 2010-12-06 16:31:04 UTC (rev 13425) +++ stack/cxf/branches/jbossws-cxf-3.4.1/src/main/scripts/assembly-deploy-artifacts.xml 2010-12-06 16:37:13 UTC (rev 13426) @@ -142,6 +142,16 @@ </dependencySet> <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> + <outputFileNameMapping>jbossws-jboss501-metadata.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + <includes> + <include>org.jboss.ws:jbossws-jboss501-metadata:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> @@ -150,6 +160,16 @@ <include>org.jboss.ws:jbossws-jboss510:jar</include> </includes> </dependencySet> + <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <outputFileNameMapping>jbossws-jboss510-metadata.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + <includes> + <include>org.jboss.ws:jbossws-jboss510-metadata:jar</include> + </includes> + </dependencySet> <!-- [JBWS-2505] --> <!-- START --> <!--