Author: richard.opalka(a)jboss.com Date: 2008-09-18 07:41:10 -0400 (Thu, 18 Sep 2008) New Revision: 8184 Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/management/pom.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt stack/native/trunk/pom.xml stack/native/trunk/profiles.xml.example stack/native/trunk/src/main/distro/build-deploy.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: switch AS versions Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2008-09-18 11:14:05 UTC (rev 8183) +++ stack/native/trunk/modules/core/pom.xml 2008-09-18 11:41:10 UTC (rev 8184) @@ -214,7 +214,7 @@ <!-- <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500CR1</artifactId> + <artifactId>jbossws-jboss500CR2</artifactId> <version>${jbossws.jboss500.version}</version> <classifier>resources</classifier> <type>zip</type> Modified: stack/native/trunk/modules/management/pom.xml =================================================================== --- stack/native/trunk/modules/management/pom.xml 2008-09-18 11:14:05 UTC (rev 8183) +++ stack/native/trunk/modules/management/pom.xml 2008-09-18 11:41:10 UTC (rev 8184) @@ -48,12 +48,12 @@ <!-- [JBWS-2263] --> <!--dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500CR1</artifactId> + <artifactId>jbossws-jboss500CR2</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500CR1</artifactId> + <artifactId>jbossws-jboss500CR2</artifactId> <classifier>container</classifier> <scope>runtime</scope> </dependency> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-09-18 11:14:05 UTC (rev 8183) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-09-18 11:41:10 UTC (rev 8184) @@ -406,7 +406,7 @@ <profile> <id>jboss500</id> <properties> - <jboss.version>5.0.0.CR1</jboss.version> + <jboss.version>5.0.0.CR2</jboss.version> <jbossws.integration.target>jboss500</jbossws.integration.target> </properties> <dependencies> @@ -435,11 +435,6 @@ <artifactId>jboss-javaee</artifactId> <version>${jboss.version}</version> </dependency> - <dependency> - <groupId>org.jboss.client</groupId> - <artifactId>jboss-client</artifactId> - <version>${jboss.version}</version> - </dependency> </dependencies> <build> <plugins> @@ -454,6 +449,11 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine> + <!-- TODO: replace with maven dependencies --> + <additionalClasspathElements> + <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/server/default/lib/jboss-ejb3-core.jar</additionalClasspathElement> + </additionalClasspathElements> </configuration> </plugin> </plugins> Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-09-18 11:14:05 UTC (rev 8183) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-09-18 11:41:10 UTC (rev 8184) @@ -9,10 +9,6 @@ # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* -# [JBWS-2194] Cannot get security domain declared through jboss.xml DD (fixed -# starting from AS 5 trunk container integration, next release 5.0.0.CR2) -org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.* - # [JBAS-5114] MessageDriven EJB3 does not create destination automatically org/jboss/test/ws/jaxws/samples/jmstransport/** org/jboss/test/ws/jaxws/samples/dar/** @@ -25,9 +21,3 @@ # [JBWS-2217] Fix BPEL samples before AS50 goes final org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* - -# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* - -# [JBWS-2258] Fix EnumTestCase (fixed in AS trunk) -org/jboss/test/ws/tools/enums/EnumTestCase.* Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-09-18 11:14:05 UTC (rev 8183) +++ stack/native/trunk/pom.xml 2008-09-18 11:41:10 UTC (rev 8184) @@ -57,8 +57,8 @@ <jbossws.jboss424.version>3.0.4-SNAPSHOT</jbossws.jboss424.version> <!-- JBWS-2263 --> <!-- - <jbossws.jboss500.version>3.0.2.GA</jbossws.jboss500.version> - <jbossws.jboss501.version>3.0.3-SNAPSHOT</jbossws.jboss501.version> + <jbossws.jboss500.version>3.0.4-SNAPSHOT</jbossws.jboss500.version> + <jbossws.jboss501.version>3.0.4-SNAPSHOT</jbossws.jboss501.version> --> <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -148,18 +148,18 @@ <!-- <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500CR1</artifactId> + <artifactId>jbossws-jboss500CR2</artifactId> <version>${jbossws.jboss500.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500CR1</artifactId> + <artifactId>jbossws-jboss500CR2</artifactId> <version>${jbossws.jboss500.version}</version> <classifier>container</classifier> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500CR1</artifactId> + <artifactId>jbossws-jboss500CR2</artifactId> <version>${jbossws.jboss500.version}</version> <classifier>resources</classifier> <type>zip</type> Modified: stack/native/trunk/profiles.xml.example =================================================================== --- stack/native/trunk/profiles.xml.example 2008-09-18 11:14:05 UTC (rev 8183) +++ stack/native/trunk/profiles.xml.example 2008-09-18 11:41:10 UTC (rev 8184) @@ -15,8 +15,8 @@ <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> <jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home> <jboss424.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home> - <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR1/build/output/jboss-5.0.0.CR1</jboss500.home> - <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR2</jboss501.home> + <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR2/build/output/jboss-5.0.0.CR2</jboss500.home> + <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.GA</jboss501.home> </properties> </profile> Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2008-09-18 11:14:05 UTC (rev 8183) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-09-18 11:41:10 UTC (rev 8184) @@ -127,10 +127,6 @@ <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> - <!-- [JBWS-2177] Test clients fail with xml-apis.jar in lib/endorsed --> - <delete file="${jboss500.home}/lib/endorsed/xml-apis.jar"/> - <!-- wsconsume will fail with a LinkageError too --> - <delete file="${jboss500.home}/lib/endorsed/jaxb-api.jar"/> </target> <!-- ================================================================== --> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-09-18 11:14:05 UTC (rev 8183) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-09-18 11:41:10 UTC (rev 8184) @@ -113,7 +113,7 @@ <scope>runtime</scope> <unpack>false</unpack> <includes> - <include>*:jbossws-jboss500CR1:jar</include> + <include>*:jbossws-jboss500CR2:jar</include> </includes> </dependencySet> <dependencySet> @@ -133,7 +133,7 @@ <scope>runtime</scope> <unpack>false</unpack> <includes> - <include>*:jbossws-jboss500CR1:jar:container</include> + <include>*:jbossws-jboss500CR2:jar:container</include> </includes> </dependencySet> <dependencySet>