Author: richard.opalka(a)jboss.com
Date: 2010-05-03 10:20:59 -0400 (Mon, 03 May 2010)
New Revision: 12138
Modified:
stack/metro/trunk/modules/management/pom.xml
stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf
stack/metro/trunk/modules/server/pom.xml
stack/metro/trunk/pom.xml
stack/metro/trunk/src/main/distro/build-deploy.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
override JBossAS 600 M3 AS IL
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2010-05-03 14:18:44 UTC (rev 12137)
+++ stack/metro/trunk/modules/management/pom.xml 2010-05-03 14:20:59 UTC (rev 12138)
@@ -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>
+ <artifactId>jbossws-jboss600M3</artifactId>
<scope>provided</scope>
</dependency>
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
===================================================================
---
stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-05-03
14:18:44 UTC (rev 12137)
+++
stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-05-03
14:20:59 UTC (rev 12138)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat
bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar
client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar
client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar
client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar
client/jbossws-native-factories.jar client/jbossws-native-services.jar
client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar
client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-common.jar
client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar
client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar
lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar
common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar
common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/l!
ib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar
common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar
common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar
common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar
common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
lib/endorsed/jaxws-api.jar server/all/deploy/jbossws.sar
server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar
server/all/deployers/jbossws.deployer/FastInfoset.jar
server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar
server/all/deployers/jbossws.deployer/jbossws-native-core.jar
server/all/deployers/jbossws.deployer/jbossws-native-factories.jar
server/all/deployers/jbossws.deployer/jbossws-native-services.jar
server/all/deployers/jbossws.deployer/jettison.jar
server/all/deployers/jbossws.deployer/netty.jar
server/all/deployers/jbossws.deployer/policy.ja!
r server/all/deployers/jbossws.deployer/wscommons-policy.jar s!
erver/al
l/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar
server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml
server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml
server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml
server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat
bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar
client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar
client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar
client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar
client/jbossws-native-factories.jar client/jbossws-native-services.jar
client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar
client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-common.jar
client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar
client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar
lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar
common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar
common/lib/wsdl4j.jar common/lib/xmlsec.jar common/!
lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar
common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar
common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar
common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar
common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
lib/endorsed/jaxws-api.jar server/all/deploy/jbossws.sar
server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar
server/all/deployers/jbossws.deployer/FastInfoset.jar
server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar
server/all/deployers/jbossws.deployer/jbossws-native-core.jar
server/all/deployers/jbossws.deployer/jbossws-native-factories.jar
server/all/deployers/jbossws.deployer/jbossws-native-services.jar
server/all/deployers/jbossws.deployer/jettison.jar
server/all/deployers/jbossws.deployer/netty.jar
server/all/deployers/jbossws.deployer/policy.jar server/all/deployer!
s/jbossws.deployer/wscommons-policy.jar server/all/deployers/j!
bossws.d
eployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar
server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml
server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml
server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml
server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
---
stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-05-03
14:18:44 UTC (rev 12137)
+++
stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-05-03
14:20:59 UTC (rev 12138)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat
bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar
client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar
client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar
client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar
client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar
client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar
client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar
client/jbossws-spi.jar client/policy.jar client/wscommons-policy.jar client/stax-ex.jar
client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar
common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar
common/lib/netty.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/l!
ib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar
common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar
common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar
common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar
common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
lib/endorsed/jaxws-api.jar server/default/deploy/jbossws.sar
server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar
server/default/deployers/jbossws.deployer/FastInfoset.jar
server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar
server/default/deployers/jbossws.deployer/jbossws-native-core.jar
server/default/deployers/jbossws.deployer/jbossws-native-factories.jar
server/default/deployers/jbossws.deployer/jbossws-native-services.jar
server/default/deployers/jbossws.deployer/jettison.jar
server/default/deployers/jbossws.deployer/netty.jar server/!
default/deployers/jbossws.deployer/policy.jar server/default/d!
eployers
/jbossws.deployer/wscommons-policy.jar
server/default/deployers/jbossws.deployer/wsdl4j.jar
server/default/deployers/jbossws.deployer/xmlsec.jar
server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml
server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml
server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml
server/default/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat
bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar
client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar
client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar
client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar
client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar
client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar
client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar
client/jbossws-spi.jar client/policy.jar client/wscommons-policy.jar client/stax-ex.jar
client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar
common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar
common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/!
lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar
common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar
common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar
common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar
common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
lib/endorsed/jaxws-api.jar server/default/deploy/jbossws.sar
server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar
server/default/deployers/jbossws.deployer/FastInfoset.jar
server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar
server/default/deployers/jbossws.deployer/jbossws-native-core.jar
server/default/deployers/jbossws.deployer/jbossws-native-factories.jar
server/default/deployers/jbossws.deployer/jbossws-native-services.jar
server/default/deployers/jbossws.deployer/jettison.jar
server/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbo!
ssws.deployer/policy.jar server/default/deployers/jbossws.depl!
oyer/wsc
ommons-policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar
server/default/deployers/jbossws.deployer/xmlsec.jar
server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml
server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml
server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml
server/default/deployers/jbossws.deployer/META-INF/standard-*-config.xml
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
---
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-03
14:18:44 UTC (rev 12137)
+++
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-03
14:20:59 UTC (rev 12138)
@@ -281,7 +281,7 @@
<target name="modify-jboss-integration"
depends="process-jboss-integration" if="fixintegration">
<sequential>
<copy todir="${targetdir}/META-INF" flatten="true"
overwrite="true">
- <fileset dir="${artifactsdir}/resources/jbossws-${jbossid}">
+ <fileset
dir="${artifactsdir}/resources/jbossws-${jbossid}/jbossws-jboss.deployer">
<include name="**/stack-agnostic-jboss-beans.xml"/>
</fileset>
</copy>
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf
===================================================================
---
stack/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-05-03
14:18:44 UTC (rev 12137)
+++
stack/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-05-03
14:20:59 UTC (rev 12138)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat
bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar
client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar
client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar
client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar
client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar
client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar
client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar
client/jbossws-spi.jar client/policy.jar client/wscommons-policy.jar client/stax-ex.jar
client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar
common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar
common/lib/netty.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/l!
ib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar
common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar
common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar
common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar
common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
lib/endorsed/jaxws-api.jar server/standard/deploy/jbossws.sar
server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar
server/standard/deployers/jbossws.deployer/FastInfoset.jar
server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar
server/standard/deployers/jbossws.deployer/jbossws-native-core.jar
server/standard/deployers/jbossws.deployer/jbossws-native-factories.jar
server/standard/deployers/jbossws.deployer/jbossws-native-services.jar
server/standard/deployers/jbossws.deployer/jettison.jar
server/standard/deployers/jbossws.deployer/netty.j!
ar server/standard/deployers/jbossws.deployer/policy.jar serve!
r/standa
rd/deployers/jbossws.deployer/wscommons-policy.jar
server/standard/deployers/jbossws.deployer/wsdl4j.jar
server/standard/deployers/jbossws.deployer/xmlsec.jar
server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml
server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml
server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml
server/standard/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat
bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar
client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar
client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar
client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar
client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar
client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar
client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar
client/jbossws-spi.jar client/policy.jar client/wscommons-policy.jar client/stax-ex.jar
client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar
common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar
common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/!
lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar
common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar
common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar
common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar
common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
lib/endorsed/jaxws-api.jar server/standard/deploy/jbossws.sar
server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar
server/standard/deployers/jbossws.deployer/FastInfoset.jar
server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar
server/standard/deployers/jbossws.deployer/jbossws-native-core.jar
server/standard/deployers/jbossws.deployer/jbossws-native-factories.jar
server/standard/deployers/jbossws.deployer/jbossws-native-services.jar
server/standard/deployers/jbossws.deployer/jettison.jar
server/standard/deployers/jbossws.deployer/netty.jar server/standard/de!
ployers/jbossws.deployer/policy.jar server/standard/deployers/!
jbossws.
deployer/wscommons-policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar
server/standard/deployers/jbossws.deployer/xmlsec.jar
server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml
server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml
server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml
server/standard/deployers/jbossws.deployer/META-INF/standard-*-config.xml
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2010-05-03 14:18:44 UTC (rev 12137)
+++ stack/metro/trunk/modules/server/pom.xml 2010-05-03 14:20:59 UTC (rev 12138)
@@ -160,17 +160,17 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory>
</artifactItem>
- <!-- JBWS-2505 -->
- <!-- START -->
- <!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600</artifactId>
- <version>${jbossws.jboss600.version}</version>
+ <artifactId>jbossws-jboss600M3</artifactId>
+ <version>${jbossws.jboss600M3.version}</version>
<classifier>resources</classifier>
<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/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2010-05-03 14:18:44 UTC (rev 12137)
+++ stack/metro/trunk/pom.xml 2010-05-03 14:20:59 UTC (rev 12138)
@@ -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.jboss600M3.version>3.3.0-SNAPSHOT</jbossws.jboss600M3.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,21 +129,21 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- <!-- JBWS-2505 -->
- <!-- START -->
- <!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600M2</artifactId>
- <version>${jbossws.jboss600M2.version}</version>
+ <artifactId>jbossws-jboss600M3</artifactId>
+ <version>${jbossws.jboss600M3.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600M2</artifactId>
- <version>${jbossws.jboss600M2.version}</version>
+ <artifactId>jbossws-jboss600M3</artifactId>
+ <version>${jbossws.jboss600M3.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ <!-- JBWS-2505 -->
+ <!-- START -->
+ <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
Modified: stack/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2010-05-03 14:18:44 UTC (rev
12137)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2010-05-03 14:20:59 UTC (rev
12138)
@@ -102,7 +102,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>
@@ -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="false" removenativecore="false"/><!--
[JBWS-2505] -->
+ <macro-undeploy-jbossws targetdir="${jboss600.server}"
defaultconf="${jbossws.default.deploy.conf}"
modifyjbossintegration="true" 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-05-03 14:18:44
UTC (rev 12137)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-03 14:20:59
UTC (rev 12138)
@@ -104,9 +104,6 @@
<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 +111,12 @@
<scope>provided</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss600M2:jar</include>
+ <include>org.jboss.ws:jbossws-jboss600M3:jar</include>
</includes>
</dependencySet>
+ <!-- JBWS-2505 -->
+ <!-- START -->
+ <!--
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>
Show replies by date