[jbossws-commits] JBossWS SVN: r11648 - in stack/cxf/trunk: modules/management and 2 other directories.

Author: alessio.soldano(a)jboss.com Date: 2010-02-19 12:05:42 -0500 (Fri, 19 Feb 2010) New Revision: 11648 Modified: stack/cxf/trunk/modules/management/pom.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/distro/build-deploy.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2895] Using container integration for AS 6.0.0.M2 Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2010-02-19 17:04:26 UTC (rev 11647) +++ stack/cxf/trunk/modules/management/pom.xml 2010-02-19 17:05:42 UTC (rev 11648) @@ -39,14 +39,14 @@ <artifactId>jbossws-jboss510</artifactId> <scope>provided</scope> </dependency> - <!-- [JBWS-2505] --> - <!-- START --> - <!-- <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600</artifactId> + <artifactId>jbossws-jboss600M2</artifactId> <scope>provided</scope> </dependency> + <!-- [JBWS-2505] --> + <!-- START --> + <!-- <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600x</artifactId> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2010-02-19 17:04:26 UTC (rev 11647) +++ stack/cxf/trunk/pom.xml 2010-02-19 17:05:42 UTC (rev 11648) @@ -48,10 +48,10 @@ <jbossws.framework.version>3.3.0-SNAPSHOT</jbossws.framework.version> <jbossws.jboss501.version>3.3.0-SNAPSHOT</jbossws.jboss501.version> <jbossws.jboss510.version>3.3.0-SNAPSHOT</jbossws.jboss510.version> + <jbossws.jboss600M2.version>3.3.0-SNAPSHOT</jbossws.jboss600M2.version> <!-- JBWS-2505 --> <!-- START --> <!-- - <jbossws.jboss600.version>3.2.1.GA</jbossws.jboss600.version> <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version> --> <!-- END --> @@ -131,21 +131,21 @@ <classifier>resources</classifier> <type>zip</type> </dependency> - <!-- JBWS-2505 --> - <!-- START --> - <!-- <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600</artifactId> - <version>${jbossws.jboss600.version}</version> + <artifactId>jbossws-jboss600M2</artifactId> + <version>${jbossws.jboss600M2.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600</artifactId> - <version>${jbossws.jboss600.version}</version> + <artifactId>jbossws-jboss600M2</artifactId> + <version>${jbossws.jboss600M2.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> + <!-- JBWS-2505 --> + <!-- START --> + <!-- <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600x</artifactId> Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-02-19 17:04:26 UTC (rev 11647) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-02-19 17:05:42 UTC (rev 11648) @@ -98,7 +98,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="false"/><!-- [JBWS-2505] --> + <param name="modifyjbossintegration" value="true"/><!-- [JBWS-2505] --> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> @@ -122,7 +122,7 @@ <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600"> <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> - <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false" removenativecore="true" /><!-- [JBWS-2505][JBWS-2895] --> + <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true" removenativecore="true" /><!-- [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-02-19 17:04:26 UTC (rev 11647) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-02-19 17:05:42 UTC (rev 11648) @@ -123,9 +123,6 @@ <include>org.jboss.ws:jbossws-jboss510:jar</include> </includes> </dependencySet> - <!-- [JBWS-2505] --> - <!-- START --> - <!-- <dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping> @@ -133,9 +130,12 @@ <scope>provided</scope> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss600:jar</include> + <include>org.jboss.ws:jbossws-jboss600M2:jar</include> </includes> </dependencySet> + <!-- [JBWS-2505] --> + <!-- START --> + <!-- <dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>