Author: alessio.soldano(a)jboss.com Date: 2011-03-31 12:35:24 -0400 (Thu, 31 Mar 2011) New Revision: 13985 Modified: stack/cxf/trunk/modules/dist/management/ stack/cxf/trunk/modules/dist/src/main/distro/test-exclude.xsl stack/cxf/trunk/modules/dist/src/main/doc/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/ResourceResolverDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/resolver/JBossWSResourceResolver.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/resolver/WebAppResolver.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/aegis/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/configuration/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/interop/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/webserviceref/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/fromjava/META-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT/ Log: Merging -r 13961, 13965 from jbossws-cxf-4.0.0.Alpha3 branch/tag Property changes on: stack/cxf/trunk/modules/dist/management ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/dist/src/main/distro/test-exclude.xsl ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/dist/src/main/doc ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-03-31 15:25:25 UTC (rev 13984) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-03-31 16:35:24 UTC (rev 13985) @@ -44,6 +44,6 @@ <module name="org.apache.ws.commons.xmlschema" /> <module name="org.apache.ws.security" /> <module name="org.apache.santuario.xmlsec" /> -<!-- <module name="org.springframework.spring" optional="true"/> --> + <module name="org.springframework.spring" optional="true"/> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-31 15:25:25 UTC (rev 13984) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-31 16:35:24 UTC (rev 13985) @@ -53,6 +53,6 @@ <module name="org.jboss.ws.jaxws-client" services="import"/> <module name="org.jboss.ws.cxf.jbossws-cxf-server" services="import"/> <module name="org.jboss.ws.spi" /> -<!-- <module name="org.springframework.spring" optional="true" /> --> + <module name="org.springframework.spring" optional="true" /> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-31 15:25:25 UTC (rev 13984) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-31 16:35:24 UTC (rev 13985) @@ -71,13 +71,13 @@ <module name="com.sun.xml.messaging.saaj" services="export" export="true"/> <module name="org.apache.ws.security" export="true"/> <module name="org.apache.santuario.xmlsec" export="true"/> -<!-- <module name="org.springframework.spring" optional="true" export="true"> + <module name="org.springframework.spring" optional="true" export="true"> <imports> <include path="META-INF"/> </imports> <exports> <include path="META-INF"/> </exports> - </module> --> + </module> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-03-31 15:25:25 UTC (rev 13984) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-03-31 16:35:24 UTC (rev 13985) @@ -56,6 +56,6 @@ <module name="org.jboss.common-core" /> <module name="org.jboss.logging" /> <module name="org.apache.ws.security" /> -<!-- <module name="org.springframework.spring" optional="true" /> --> + <module name="org.springframework.spring" optional="true" /> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2011-03-31 15:25:25 UTC (rev 13984) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2011-03-31 16:35:24 UTC (rev 13985) @@ -37,7 +37,7 @@ <module name="org.apache.cxf" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/spring.*"/> + <include path="META-INF/"/> </imports> </module> <module name="com.sun.httpserver"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-03-31 15:25:25 UTC (rev 13984) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-03-31 16:35:24 UTC (rev 13985) @@ -51,6 +51,6 @@ </module> <module name="org.apache.neethi" /> <module name="org.jboss.logging" /> -<!-- <module name="org.springframework.spring" optional="true" /> --> + <module name="org.springframework.spring" optional="true" /> </dependencies> </module> Property changes on: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/ResourceResolverDeploymentAspect.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/resolver/JBossWSResourceResolver.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/resolver/WebAppResolver.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/aegis ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/configuration ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/interop ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/webserviceref ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/fromjava/META-INF/jbossws-cxf.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-03-31 15:25:25 UTC (rev 13984) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-03-31 16:35:24 UTC (rev 13985) @@ -930,33 +930,23 @@ <!-- EJB3 endpoint deployments --> <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1446/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1556/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1665/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2183/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2218/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2257/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2701/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2934/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2937/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude> Property changes on: stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT ___________________________________________________________________ Deleted: svn:mergeinfo -