JBossWS SVN: r13262 - in stack/native/trunk: modules/core and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-11-16 17:57:48 -0500 (Tue, 16 Nov 2010)
New Revision: 13262
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-jboss600.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:
Moving to AS 6 CR1 instead of AS 6 M5
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2010-11-16 22:50:00 UTC (rev 13261)
+++ stack/native/trunk/modules/core/pom.xml 2010-11-16 22:57:48 UTC (rev 13262)
@@ -219,6 +219,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>
@@ -227,9 +230,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/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2010-11-16 22:50:00 UTC (rev 13261)
+++ stack/native/trunk/modules/management/pom.xml 2010-11-16 22:57:48 UTC (rev 13262)
@@ -44,6 +44,9 @@
<artifactId>jbossws-jboss510</artifactId>
<scope>provided</scope>
</dependency>
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510-metadata</artifactId>
@@ -54,9 +57,6 @@
<artifactId>jbossws-jboss600M5</artifactId>
<scope>provided</scope>
</dependency>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2010-11-16 22:50:00 UTC (rev 13261)
+++ stack/native/trunk/modules/testsuite/pom.xml 2010-11-16 22:57:48 UTC (rev 13262)
@@ -441,7 +441,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/native/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-11-16 22:50:00 UTC (rev 13261)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-11-16 22:57:48 UTC (rev 13262)
@@ -7,23 +7,5 @@
# [JBAS-8363] Virtual host issue in JBossWeb
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-# [JBWS-3140] mtom, wsaddressing support in webservices.xml
-org/jboss/test/ws/jaxws/jbws3140/**
-
# [JBWS-3150] This test causes hudson to freeze
org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*
-
-# TODO: remove these excludes once AS 600 RC1 is out
-**/jaxrpc/**/*TestCase.*
-**/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.*
-org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.*
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2010-11-16 22:50:00 UTC (rev 13261)
+++ stack/native/trunk/pom.xml 2010-11-16 22:57:48 UTC (rev 13262)
@@ -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 -->
@@ -142,6 +142,9 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600M5</artifactId>
@@ -154,9 +157,6 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
Modified: stack/native/trunk/profiles.xml.example
===================================================================
--- stack/native/trunk/profiles.xml.example 2010-11-16 22:50:00 UTC (rev 13261)
+++ stack/native/trunk/profiles.xml.example 2010-11-16 22:57:48 UTC (rev 13262)
@@ -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/native/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-deploy.xml 2010-11-16 22:50:00 UTC (rev 13261)
+++ stack/native/trunk/src/main/distro/build-deploy.xml 2010-11-16 22:57:48 UTC (rev 13262)
@@ -104,7 +104,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>
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
@@ -131,7 +131,7 @@
<macro-undeploy-jbossws targetdir="${jboss600.server}"
defaultconf="${jbossws.default.deploy.conf}"
defaultserverconf="${jbossws.default.server.deploy.conf}"
- modifyjbossintegration="true"/><!-- [JBWS-2505] -->
+ modifyjbossintegration="false"/><!-- [JBWS-2505] -->
</target>
<!-- ================================================================== -->
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-11-16 22:50:00 UTC (rev 13261)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-11-16 22:57:48 UTC (rev 13262)
@@ -161,6 +161,9 @@
<include>org.jboss.ws:jbossws-jboss510:jar</include>
</includes>
</dependencySet>
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!--
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss510-metadata.${module.extension}</outputFileNameMapping>
@@ -181,9 +184,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>