Author: richard.opalka(a)jboss.com Date: 2008-09-18 07:14:05 -0400 (Thu, 18 Sep 2008) New Revision: 8183 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-jboss500.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: switch AS versions Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2008-09-18 11:02:33 UTC (rev 8182) +++ stack/cxf/trunk/modules/management/pom.xml 2008-09-18 11:14:05 UTC (rev 8183) @@ -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/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2008-09-18 11:02:33 UTC (rev 8182) +++ stack/cxf/trunk/modules/server/pom.xml 2008-09-18 11:14:05 UTC (rev 8183) @@ -193,7 +193,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/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2008-09-18 11:02:33 UTC (rev 8182) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-09-18 11:14:05 UTC (rev 8183) @@ -372,7 +372,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> @@ -382,16 +382,6 @@ <version>${jboss.version}</version> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>${hibernate.version}</version> - </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - <version>${asm.version}</version> - </dependency> - <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-ejb3</artifactId> <version>${jboss.version}</version> @@ -401,11 +391,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> @@ -420,6 +405,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/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-09-18 11:02:33 UTC (rev 8182) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-09-18 11:14:05 UTC (rev 8183) @@ -102,16 +102,9 @@ # [JBWS-2165] Fix xop tests with maven build org/jboss/test/ws/jaxws/samples/xop/** -# [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.* - # [JBWS-2223] wsconsume for cxf build org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** # [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF org/jboss/test/ws/jaxws/jbws1178/** - -# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2008-09-18 11:02:33 UTC (rev 8182) +++ stack/cxf/trunk/pom.xml 2008-09-18 11:14:05 UTC (rev 8183) @@ -52,8 +52,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> --> <cxf.version>2.1</cxf.version> <cxf.stax.version>1.0.1</cxf.stax.version> @@ -136,18 +136,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/cxf/trunk/profiles.xml.example =================================================================== --- stack/cxf/trunk/profiles.xml.example 2008-09-18 11:02:33 UTC (rev 8182) +++ stack/cxf/trunk/profiles.xml.example 2008-09-18 11:14:05 UTC (rev 8183) @@ -14,8 +14,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/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-09-18 11:02:33 UTC (rev 8182) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-09-18 11:14:05 UTC (rev 8183) @@ -127,8 +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"/> </target> <!-- ================================================================== --> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-09-18 11:02:33 UTC (rev 8182) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-09-18 11:14:05 UTC (rev 8183) @@ -100,7 +100,7 @@ <scope>runtime</scope> <unpack>false</unpack> <includes> - <include>*:jbossws-jboss500CR1:jar</include> + <include>*:jbossws-jboss500CR2:jar</include> </includes> </dependencySet> <dependencySet> @@ -120,7 +120,7 @@ <scope>runtime</scope> <unpack>false</unpack> <includes> - <include>*:jbossws-jboss500CR1:jar:container</include> + <include>*:jbossws-jboss500CR2:jar:container</include> </includes> </dependencySet> <dependencySet>