Author: richard.opalka(a)jboss.com Date: 2010-04-30 10:11:10 -0400 (Fri, 30 Apr 2010) New Revision: 12133 Modified: stack/metro/trunk/modules/management/pom.xml stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/metro/trunk/modules/testsuite/pom.xml stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt stack/metro/trunk/pom.xml stack/metro/trunk/profiles.xml.example stack/metro/trunk/src/main/distro/build-deploy.xml stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: switching to AS 600 M3 plus updating excludes Modified: stack/metro/trunk/modules/management/pom.xml =================================================================== --- stack/metro/trunk/modules/management/pom.xml 2010-04-30 13:46:41 UTC (rev 12132) +++ stack/metro/trunk/modules/management/pom.xml 2010-04-30 14:11:10 UTC (rev 12133) @@ -39,14 +39,14 @@ <artifactId>jbossws-jboss510</artifactId> <scope>provided</scope> </dependency> + <!-- [JBWS-2505] --> + <!-- START --> + <!-- <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600M2</artifactId> <scope>provided</scope> </dependency> - <!-- [JBWS-2505] --> - <!-- START --> - <!-- <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600x</artifactId> Modified: stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2010-04-30 13:46:41 UTC (rev 12132) +++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2010-04-30 14:11:10 UTC (rev 12133) @@ -38,6 +38,11 @@ <copy file="${src.dir}/jbossws-jaxrpc-config-as6.xml" + tofile="${dest.dir}/jbossws-jaxrpc-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> + + <copy + file="${src.dir}/jbossws-jaxrpc-config-as6.xml" tofile="${dest.dir}/jbossws-jaxrpc-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" /> </target> Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2010-04-30 13:46:41 UTC (rev 12132) +++ stack/metro/trunk/modules/testsuite/pom.xml 2010-04-30 14:11:10 UTC (rev 12133) @@ -460,7 +460,7 @@ <profile> <id>jboss600</id> <properties> - <jboss.version>6.0.0.20100216-M2</jboss.version> + <jboss.version>6.0.0.20100429-M3</jboss.version> <jbossws.integration.target>jboss600</jbossws.integration.target> </properties> <dependencies> @@ -471,24 +471,57 @@ </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-aspects</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-connector</artifactId> + <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-jaxws</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-ejb3</artifactId> <version>${jboss.version}</version> <exclusions> <exclusion> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + </exclusion> + <exclusion> <groupId>org.jboss.security</groupId> <artifactId>jbosssx</artifactId> </exclusion> </exclusions> </dependency> <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-javaee</artifactId> + <version>${jboss.javaee.version}</version> + </dependency> + <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-security</artifactId> <version>${jboss.version}</version> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-javaee</artifactId> - <version>${jboss.javaee.version}</version> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-system</artifactId> + <version>${jboss.version}</version> </dependency> </dependencies> <build> @@ -508,7 +541,7 @@ <!-- TODO: replace with maven dependencies --> <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <!-- Libs below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack --> + <!-- Libs below required just for jaxrpc tests; listed here to prevent Metro stack from depending on Native stack --> <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> <additionalClasspathElement>${jboss.home}/common/lib/netty.jar</additionalClasspathElement> </additionalClasspathElements> @@ -606,7 +639,7 @@ <!-- TODO: replace with maven dependencies --> <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <!-- Libs below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack --> + <!-- Libs below required just for jaxrpc tests; listed here to prevent Metro stack from depending on Native stack --> <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> <additionalClasspathElement>${jboss.home}/common/lib/netty.jar</additionalClasspathElement> </additionalClasspathElements> Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-30 13:46:41 UTC (rev 12132) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-30 14:11:10 UTC (rev 12133) @@ -53,23 +53,18 @@ # [JBWS-2915] WSDL metadata is missing in EPR org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceTestCase.* -# [JBWS-2917] We're using buggy xalan version causing namespaces issues -org/jboss/test/ws/jaxws/jbws2917/** -org/jboss/test/ws/jaxws/jbws2937/** -org/jboss/test/ws/jaxws/jbws2942/** -org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* - -# [JBWS-2895] JAX-RPC available from AS 6.0.0.M3 -org/jboss/test/ws/jaxrpc/** - # [JBWS-2989] Write published wsdl to file on deploy org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.* # These tests require JAX-WS 2.2 API +org/jboss/test/ws/jaxws/jbws2917/** +org/jboss/test/ws/jaxws/jbws2937/** +org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws2985/** org/jboss/test/ws/jaxws/jbws2991/** org/jboss/test/ws/jaxws/jbws3008/** +org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* # [JBWS-2998] Complete integration development for JSR109 requirements org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.* Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2010-04-30 13:46:41 UTC (rev 12132) +++ stack/metro/trunk/pom.xml 2010-04-30 14:11:10 UTC (rev 12133) @@ -50,10 +50,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.jboss600M2.version>3.3.0-SNAPSHOT</jbossws.jboss600M2.version> <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version> --> <!-- END --> @@ -129,6 +129,9 @@ <classifier>resources</classifier> <type>zip</type> </dependency> + <!-- JBWS-2505 --> + <!-- START --> + <!-- <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600M2</artifactId> @@ -141,9 +144,6 @@ <classifier>resources</classifier> <type>zip</type> </dependency> - <!-- JBWS-2505 --> - <!-- START --> - <!-- <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600x</artifactId> Modified: stack/metro/trunk/profiles.xml.example =================================================================== --- stack/metro/trunk/profiles.xml.example 2010-04-30 13:46:41 UTC (rev 12132) +++ stack/metro/trunk/profiles.xml.example 2010-04-30 14:11:10 UTC (rev 12133) @@ -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>/opt/svn/jbossas/tags/JBoss_6_0_0_20100216-M2/build/target/jboss-6.0.0.20100216-M2</jboss600.home> + <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.20100429-M3/build/target/jboss-6.0.0.20100429-M3</jboss600.home> <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss601.home> </properties> </profile> Modified: stack/metro/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-deploy.xml 2010-04-30 13:46:41 UTC (rev 12132) +++ stack/metro/trunk/src/main/distro/build-deploy.xml 2010-04-30 14:11:10 UTC (rev 12133) @@ -97,12 +97,12 @@ <target name="deploy-structure-jboss600" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-metro" inheritall="false"> + <antcall target="deploy-jbossws-metro-with-jaxrpc" inheritall="false"> <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> <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> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> @@ -128,7 +128,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="true" removenativecore="true"/><!-- [JBWS-2505] --> + <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false" removenativecore="false"/><!-- [JBWS-2505] --> </target> <!-- ================================================================== --> Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-04-30 13:46:41 UTC (rev 12132) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-04-30 14:11:10 UTC (rev 12133) @@ -104,6 +104,9 @@ <include>org.jboss.ws:jbossws-jboss510:jar</include> </includes> </dependencySet> + <!-- JBWS-2505 --> + <!-- START --> + <!-- <dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping> @@ -114,9 +117,6 @@ <include>org.jboss.ws:jbossws-jboss600M2:jar</include> </includes> </dependencySet> - <!-- JBWS-2505 --> - <!-- START --> - <!-- <dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>