Author: alessio.soldano(a)jboss.com Date: 2010-11-16 17:50:00 -0500 (Tue, 16 Nov 2010) New Revision: 13261 Modified: stack/cxf/trunk/modules/management/pom.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt stack/cxf/trunk/pom.xml stack/cxf/trunk/profiles.xml.example stack/cxf/trunk/src/main/distro/build-deploy.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: Moving to AS 6 CR1 instead of AS6 M5 Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2010-11-16 22:46:12 UTC (rev 13260) +++ stack/cxf/trunk/modules/management/pom.xml 2010-11-16 22:50:00 UTC (rev 13261) @@ -69,6 +69,9 @@ <artifactId>jbossws-jboss510-metadata</artifactId> <scope>provided</scope> </dependency> + <!-- [JBWS-2505] --> + <!-- START --> + <!-- <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600M5</artifactId> @@ -84,9 +87,6 @@ </exclusion> </exclusions> </dependency> - <!-- [JBWS-2505] --> - <!-- START --> - <!-- <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600x</artifactId> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2010-11-16 22:46:12 UTC (rev 13260) +++ stack/cxf/trunk/modules/server/pom.xml 2010-11-16 22:50:00 UTC (rev 13261) @@ -296,6 +296,9 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory> </artifactItem> + <!-- JBWS-2505 --> + <!-- START --> + <!-- <artifactItem> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600M5</artifactId> @@ -304,9 +307,6 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory> </artifactItem> - <!-- JBWS-2505 --> - <!-- START --> - <!-- <artifactItem> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600x</artifactId> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2010-11-16 22:46:12 UTC (rev 13260) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2010-11-16 22:50:00 UTC (rev 13261) @@ -516,7 +516,7 @@ <profile> <id>jboss600</id> <properties> - <jboss.version>6.0.0.20100911-M5</jboss.version> + <jboss.version>6.0.0.20101110-CR1</jboss.version> <jbossws.integration.target>jboss600</jbossws.integration.target> </properties> <dependencies> Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-11-16 22:46:12 UTC (rev 13260) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-11-16 22:50:00 UTC (rev 13261) @@ -19,23 +19,5 @@ # [JBWS-2397] Fix jbws1797 testcase org/jboss/test/ws/jaxws/jbws1797/** -# [JBWS-3140] mtom, wsaddressing support in webservices.xml; jboss-metadata-common doesn't support this metadata by in AS600 -org/jboss/test/ws/jaxws/jbws3140/** - # [JBAS-8363] Virtual host issue in JBossWeb org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* - -# TODO: remove these excludes once AS 600 RC1 is out -org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.* -**/jaxrpc/** -**/serviceref/** -**/webserviceref/** -org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.* -org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.* -org/jboss/test/ws/jaxws/samples/advanced/retail/RetailSampleTestCase.* -org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.* -org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.* -org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.* -org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.* -org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.* -org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.* Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2010-11-16 22:46:12 UTC (rev 13260) +++ stack/cxf/trunk/pom.xml 2010-11-16 22:50:00 UTC (rev 13261) @@ -51,10 +51,10 @@ <jbossws.framework.version>3.4.0-SNAPSHOT</jbossws.framework.version> <jbossws.jboss501.version>3.4.0-SNAPSHOT</jbossws.jboss501.version> <jbossws.jboss510.version>3.4.0-SNAPSHOT</jbossws.jboss510.version> - <jbossws.jboss600M5.version>3.4.0-SNAPSHOT</jbossws.jboss600M5.version> <!-- JBWS-2505 --> <!-- START --> <!-- + <jbossws.jboss600M5.version>3.4.0-SNAPSHOT</jbossws.jboss600M5.version> <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version> --> <!-- END --> @@ -154,6 +154,9 @@ <classifier>resources</classifier> <type>zip</type> </dependency> + <!-- JBWS-2505 --> + <!-- START --> + <!-- <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600M5</artifactId> @@ -166,9 +169,6 @@ <classifier>resources</classifier> <type>zip</type> </dependency> - <!-- JBWS-2505 --> - <!-- START --> - <!-- <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600x</artifactId> Modified: stack/cxf/trunk/profiles.xml.example =================================================================== --- stack/cxf/trunk/profiles.xml.example 2010-11-16 22:46:12 UTC (rev 13260) +++ stack/cxf/trunk/profiles.xml.example 2010-11-16 22:50:00 UTC (rev 13261) @@ -13,7 +13,7 @@ <properties> <jboss501.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home> <jboss510.home>/home/opalka/svn/jbossas/tags/JBoss_5_1_0_GA/build/output/jboss-5.1.0.GA</jboss510.home> - <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.20100911-M5/build/target/jboss-6.0.0.20100911-M5</jboss600.home> + <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.20101110-CR1/build/target/jboss-6.0.0.20101110-CR1</jboss600.home> <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss601.home> </properties> </profile> Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-11-16 22:46:12 UTC (rev 13260) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-11-16 22:50:00 UTC (rev 13261) @@ -106,7 +106,7 @@ <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="modifyjbossintegration" value="true"/><!-- [JBWS-2505] --> + <param name="modifyjbossintegration" value="false"/><!-- [JBWS-2505] --> </antcall> </target> @@ -133,7 +133,7 @@ <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" defaultserverconf="${jbossws.default.server.deploy.conf}" - modifyjbossintegration="true" + modifyjbossintegration="false" removenativecore="false" /><!-- [JBWS-2505][JBWS-2895] --> </target> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-11-16 22:46:12 UTC (rev 13260) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-11-16 22:50:00 UTC (rev 13261) @@ -170,6 +170,9 @@ <include>org.jboss.ws:jbossws-jboss510-metadata:jar</include> </includes> </dependencySet> + <!-- [JBWS-2505] --> + <!-- START --> + <!-- <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping> @@ -180,9 +183,6 @@ <include>org.jboss.ws:jbossws-jboss600M5:jar</include> </includes> </dependencySet> - <!-- [JBWS-2505] --> - <!-- START --> - <!-- <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>