[jbossws-commits] JBossWS SVN: r15774 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/dist/src/main/distro and 3 other directories.

Author: alessio.soldano(a)jboss.com Date: 2012-02-28 09:43:04 -0500 (Tue, 28 Feb 2012) New Revision: 15774 Removed: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmsendpoints/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/ Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml Log: Merged revisions 15768,15773 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15768 | alessio.soldano(a)jboss.com | 2012-02-28 11:42:25 +0100 (Tue, 28 Feb 2012) | 2 lines Removing AS6 tests (former WS JMS support, replaced by SOAP-over-JMS on AS 7.x) ....... r15773 | alessio.soldano(a)jboss.com | 2012-02-28 15:38:09 +0100 (Tue, 28 Feb 2012) | 2 lines [JBWS-3447] Sort jbossws-cxf bin dist classpath ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml 2012-02-28 14:38:09 UTC (rev 15773) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml 2012-02-28 14:43:04 UTC (rev 15774) @@ -76,10 +76,14 @@ </target> <target name="tests-init" depends="init,tests-classpath"> - + <!-- JBossWS jars first to override META-INF/services declarations duplicated in CXF jars (alternative is using endorsing) --> <path id="ws.stack.classpath"> <fileset dir="${thirdparty.dir}"> + <include name="**/jbossws*.jar"/> <exclude name="**/jbossws-jboss*.jar"/> + </fileset> + <fileset dir="${thirdparty.dir}"> + <exclude name="**/jbossws*.jar"/> <exclude name="**/jboss-as-webservices-tests-integration.jar"/> </fileset> </path> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-28 14:38:09 UTC (rev 15773) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-28 14:43:04 UTC (rev 15774) @@ -716,9 +716,6 @@ <!-- JAXR not available --> <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - <!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 --> - <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude> - <!-- # [AS7-1322] Implemented on AS 7.1.0 or greater only --> <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> @@ -895,9 +892,6 @@ <!-- JAXR not available --> <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - <!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 --> - <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude> - <!-- # [AS7-1322] Implemented on AS 7.1.0 or greater only --> <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> @@ -1106,9 +1100,6 @@ <!-- # Seems MSFT interop. endpoints are down :(--> <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude> - <!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 --> - <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude> - <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher // also see compile exclude above --> <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> @@ -1322,9 +1313,6 @@ <!-- # Seems MSFT interop. endpoints are down :(--> <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude> - <!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 --> - <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude> - <!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 --> <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude>