Author: richard.opalka(a)jboss.com
Date: 2009-12-09 15:41:08 -0500 (Wed, 09 Dec 2009)
New Revision: 11237
Added:
stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt
Removed:
stack/metro/trunk/modules/testsuite/test-excludes-jboss520.txt
Modified:
stack/metro/trunk/build.xml
stack/metro/trunk/modules/management/pom.xml
stack/metro/trunk/modules/server/pom.xml
stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/metro/trunk/modules/testsuite/pom.xml
stack/metro/trunk/pom.xml
stack/metro/trunk/profiles.xml.example
stack/metro/trunk/src/main/distro/Install.txt
stack/metro/trunk/src/main/distro/ant.properties.example
stack/metro/trunk/src/main/distro/build-deploy.xml
stack/metro/trunk/src/main/distro/build-setup.xml
stack/metro/trunk/src/main/distro/build.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2848] fixing Metro
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/build.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -63,27 +63,27 @@
<condition property="jboss510.home"
value="${profiles.profile.properties.jboss510.home}">
<isset property="profiles.profile.properties.jboss510.home"/>
</condition>
- <condition property="jboss520.home"
value="${profiles.profile.properties.jboss520.home}">
- <isset property="profiles.profile.properties.jboss520.home"/>
- </condition>
<condition property="jboss600.home"
value="${profiles.profile.properties.jboss600.home}">
<isset property="profiles.profile.properties.jboss600.home"/>
</condition>
+ <condition property="jboss601.home"
value="${profiles.profile.properties.jboss601.home}">
+ <isset property="profiles.profile.properties.jboss601.home"/>
+ </condition>
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml"
keeproot="false"/>
<property name="jboss500.home"
value="${profiles.profile.properties.jboss500.home}"/>
<property name="jboss501.home"
value="${profiles.profile.properties.jboss501.home}"/>
<property name="jboss510.home"
value="${profiles.profile.properties.jboss510.home}"/>
- <property name="jboss520.home"
value="${profiles.profile.properties.jboss520.home}"/>
<property name="jboss600.home"
value="${profiles.profile.properties.jboss600.home}"/>
+ <property name="jboss601.home"
value="${profiles.profile.properties.jboss601.home}"/>
<echo/>
<echo message="jboss500.home=${jboss500.home}"/>
<echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
- <echo message="jboss520.home=${jboss520.home}"/>
<echo message="jboss600.home=${jboss600.home}"/>
+ <echo message="jboss601.home=${jboss601.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/modules/management/pom.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -49,7 +49,7 @@
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss520x</artifactId>
+ <artifactId>jbossws-jboss600</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/modules/server/pom.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -173,19 +173,19 @@
<!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss520x</artifactId>
- <version>${jbossws.jboss520.version}</version>
+ <artifactId>jbossws-jboss600</artifactId>
+ <version>${jbossws.jboss600.version}</version>
<classifier>resources</classifier>
<type>zip</type>
-
<outputDirectory>${project.build.directory}/resources/jbossws-jboss520</outputDirectory>
+
<outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
+ <version>${jbossws.jboss601.version}</version>
<classifier>resources</classifier>
<type>zip</type>
-
<outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
+
<outputDirectory>${project.build.directory}/resources/jbossws-jboss601</outputDirectory>
</artifactItem>
-->
<!-- END -->
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 2009-12-09
20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-12-09
20:41:08 UTC (rev 11237)
@@ -33,12 +33,12 @@
<copy
file="${src.dir}/jbossws-metro-config-as6.xml"
-
tofile="${dest.dir}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+
tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
file="${src.dir}/jbossws-metro-config-as6.xml"
-
tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+
tofile="${dest.dir}/jbossws-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 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -503,14 +503,14 @@
</profile>
<!--
- Name: jboss520
- Descr: JBoss-5.2.0 specific options
+ Name: jboss600
+ Descr: JBoss-6.0.0 specific options
-->
<profile>
- <id>jboss520</id>
+ <id>jboss600</id>
<properties>
- <jboss.version>5.2.0-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss520</jbossws.integration.target>
+ <jboss.version>6.0.0.M1</jboss.version>
+ <jbossws.integration.target>jboss600</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
@@ -546,13 +546,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!--
http://jira.codehaus.org/browse/MCOMPILER-72 -->
-
<testExcludeFile>../test-excludes-jboss520.txt</testExcludeFile>
+
<testExcludeFile>../test-excludes-jboss600.txt</testExcludeFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args}
-Djava.endorsed.dirs=${jboss520.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args}
-Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
@@ -564,14 +564,14 @@
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
+ Name: jboss601
+ Descr: JBoss-6.0.1 specific options
-->
<profile>
- <id>jboss600</id>
+ <id>jboss601</id>
<properties>
<jboss.version>6.0.0-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
+ <jbossws.integration.target>jboss601</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
@@ -607,13 +607,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!--
http://jira.codehaus.org/browse/MCOMPILER-72 -->
-
<testExcludeFile>../test-excludes-jboss600.txt</testExcludeFile>
+
<testExcludeFile>../test-excludes-jboss601.txt</testExcludeFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args}
-Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args}
-Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss520.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-12-09 20:38:07 UTC
(rev 11236)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-12-09 20:41:08 UTC
(rev 11237)
@@ -1,51 +0,0 @@
-# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBWS-1949] Metro MTOM ignores content-type on attachment part
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.*
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.*
-org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.*
-
-# [JBWS-2102] JSR-261 impl not available in Metro
-org/jboss/test/ws/jaxws/samples/addressing/**
-
-# [JBWS-2596] Resource injection in jaxws endpoints and handlers
-org/jboss/test/ws/jaxws/jbws2074/**
-org/jboss/test/ws/jaxws/jbws2634/**
-
-# [JBWS-2127] Cannot generate WSDL for binding
"http://www.w3.org/2003/05/soap/bindings/HTTP/"
-org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws2183/**
-
-# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
-org/jboss/test/ws/jaxws/jbws1702/**
-
-# [JBWS-2308] faultCode argument for createFault was passed NULL
-org/jboss/test/ws/jaxws/jbws2308/*TestCase.*
-
-# [JBWS-2329] Failed to deploy service with multiple bindings
-org/jboss/test/ws/jaxws/jbws2278/**
-
-# [JBWS-2347] Rewrite @WebFault related tests
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/webfault/**
-
-# [JBWS-2348] Fix jbws1969 testcase
-org/jboss/test/ws/jaxws/jbws1969/**
-
-# [JBWS-2397] Fix jbws1797 testcase
-org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2400] Rewrite large attachment testcase
-org/jboss/test/ws/jaxws/jbws2000/**
-
-# [JBWS-2462] Address rewrite test fails in Metro integration
-org/jboss/test/ws/jaxws/jbws2150/**
-
-# [JBWS-2715] JAXBIntroductions support
-org/jboss/test/ws/jaxws/jaxbcust/**
-org/jboss/test/ws/jaxws/samples/jaxbintros/**
Added: stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt
(rev 0)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt 2009-12-09 20:41:08 UTC
(rev 11237)
@@ -0,0 +1,51 @@
+# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
+org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
+
+# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+
+# [JBWS-1949] Metro MTOM ignores content-type on attachment part
+org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.*
+org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.*
+org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.*
+
+# [JBWS-2102] JSR-261 impl not available in Metro
+org/jboss/test/ws/jaxws/samples/addressing/**
+
+# [JBWS-2596] Resource injection in jaxws endpoints and handlers
+org/jboss/test/ws/jaxws/jbws2074/**
+org/jboss/test/ws/jaxws/jbws2634/**
+
+# [JBWS-2127] Cannot generate WSDL for binding
"http://www.w3.org/2003/05/soap/bindings/HTTP/"
+org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/handlerscope/**
+org/jboss/test/ws/jaxws/jbws2183/**
+
+# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
+org/jboss/test/ws/jaxws/jbws1702/**
+
+# [JBWS-2308] faultCode argument for createFault was passed NULL
+org/jboss/test/ws/jaxws/jbws2308/*TestCase.*
+
+# [JBWS-2329] Failed to deploy service with multiple bindings
+org/jboss/test/ws/jaxws/jbws2278/**
+
+# [JBWS-2347] Rewrite @WebFault related tests
+org/jboss/test/ws/jaxws/jbws1904/**
+org/jboss/test/ws/jaxws/webfault/**
+
+# [JBWS-2348] Fix jbws1969 testcase
+org/jboss/test/ws/jaxws/jbws1969/**
+
+# [JBWS-2397] Fix jbws1797 testcase
+org/jboss/test/ws/jaxws/jbws1797/**
+
+# [JBWS-2400] Rewrite large attachment testcase
+org/jboss/test/ws/jaxws/jbws2000/**
+
+# [JBWS-2462] Address rewrite test fails in Metro integration
+org/jboss/test/ws/jaxws/jbws2150/**
+
+# [JBWS-2715] JAXBIntroductions support
+org/jboss/test/ws/jaxws/jaxbcust/**
+org/jboss/test/ws/jaxws/samples/jaxbintros/**
Property changes on: stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt
___________________________________________________________________
Name: svn:executable
+ *
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/pom.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -53,8 +53,8 @@
<!-- JBWS-2505 -->
<!-- START -->
<!--
- <jbossws.jboss520.version>3.2.1.GA</jbossws.jboss520.version>
<jbossws.jboss600.version>3.2.1.GA</jbossws.jboss600.version>
+ <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
<jboss.common.version>1.2.1.GA</jboss.common.version>
@@ -145,25 +145,25 @@
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss520x</artifactId>
- <version>${jbossws.jboss520.version}</version>
+ <artifactId>jbossws-jboss600</artifactId>
+ <version>${jbossws.jboss600.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss520x</artifactId>
- <version>${jbossws.jboss520.version}</version>
+ <artifactId>jbossws-jboss600</artifactId>
+ <version>${jbossws.jboss600.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
+ <version>${jbossws.jboss601.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
+ <version>${jbossws.jboss601.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
@@ -512,26 +512,26 @@
</profile>
<!--
- Name: jboss520
- Descr: JBoss-5.2.0 specific options
+ Name: jboss600
+ Descr: JBoss-6.0.0 specific options
-->
<profile>
- <id>jboss520</id>
+ <id>jboss600</id>
<properties>
- <jbossws.integration.target>jboss520</jbossws.integration.target>
- <jboss.home>${jboss520.home}</jboss.home>
+ <jbossws.integration.target>jboss600</jbossws.integration.target>
+ <jboss.home>${jboss600.home}</jboss.home>
</properties>
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
+ Name: jboss601
+ Descr: JBoss-6.0.1 specific options
-->
<profile>
- <id>jboss600</id>
+ <id>jboss601</id>
<properties>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
- <jboss.home>${jboss600.home}</jboss.home>
+ <jbossws.integration.target>jboss601</jbossws.integration.target>
+ <jboss.home>${jboss601.home}</jboss.home>
</properties>
</profile>
Modified: stack/metro/trunk/profiles.xml.example
===================================================================
--- stack/metro/trunk/profiles.xml.example 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/profiles.xml.example 2009-12-09 20:41:08 UTC (rev 11237)
@@ -14,8 +14,8 @@
<jboss500.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
<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>
-
<jboss520.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.2.0.Beta</jboss520.home>
-
<jboss600.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss600.home>
+
<jboss600.home>/home/opalka/svn/jbossas/tags/JBoss_6_0_0_M1/build/output/jboss-6.0.0.M1</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/Install.txt
===================================================================
--- stack/metro/trunk/src/main/distro/Install.txt 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/src/main/distro/Install.txt 2009-12-09 20:41:08 UTC (rev 11237)
@@ -16,8 +16,8 @@
ant deploy-jboss500
ant deploy-jboss501
ant deploy-jboss510
- ant deploy-jboss520
ant deploy-jboss600
+ ant deploy-jboss601
4.) Execute the samples to verify your installation
Modified: stack/metro/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/metro/trunk/src/main/distro/ant.properties.example 2009-12-09 20:38:07 UTC (rev
11236)
+++ stack/metro/trunk/src/main/distro/ant.properties.example 2009-12-09 20:41:08 UTC (rev
11237)
@@ -6,10 +6,10 @@
jboss500.home=(a)jboss500.home@
jboss501.home=(a)jboss501.home@
jboss510.home=(a)jboss510.home@
-jboss520.home=(a)jboss520.home@
jboss600.home=(a)jboss600.home@
+jboss601.home=(a)jboss601.home@
-# The JBoss server under test. This can be
[jboss500|jboss501|jboss510|jboss520|jboss600]
+# The JBoss server under test. This can be
[jboss500|jboss501|jboss510|jboss600|jboss601]
jbossws.integration.target=jboss510
# The JBoss settings
Modified: stack/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2009-12-09 20:38:07 UTC (rev
11236)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2009-12-09 20:41:08 UTC (rev
11237)
@@ -116,10 +116,10 @@
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-5.2.x -->
+ <!-- Prepare Deployment Structure JBoss-6.0.0 -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss52"
depends="prepare-deploy">
+ <target name="deploy-structure-jboss600"
depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-metro" inheritall="false">
<param name="installserver"
value="${deploy.structure}/server/${jboss.server.instance}"/>
@@ -132,34 +132,34 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss520 -->
+ <!-- Deployment JBoss600 -->
<!-- ================================================================== -->
- <target name="target-jboss520">
+ <target name="target-jboss600">
<property name="jboss.server.instance" value="default"/>
- <property name="jbossws.integration.target"
value="jboss520"/>
+ <property name="jbossws.integration.target"
value="jboss600"/>
<echo
message="jbossws.integration.target=${jbossws.integration.target}${line.separator}"
file="${target.properties.file}"/>
<echo
message="jboss.server.instance=${jboss.server.instance}${line.separator}"
file="${target.properties.file}" append="true"/>
</target>
- <target name="deploy-jboss520"
depends="undeploy-jboss520,deploy-structure-jboss52" description="Deploy
jbossws to jboss520">
- <fail message="Not available: ${jboss520.available.file}"
unless="jboss520.available"/>
- <copy todir="${jboss520.home}" overwrite="true">
+ <target name="deploy-jboss600"
depends="undeploy-jboss600,deploy-structure-jboss600" description="Deploy
jbossws to jboss600">
+ <fail message="Not available: ${jboss600.available.file}"
unless="jboss600.available"/>
+ <copy todir="${jboss600.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
</copy>
- <chmod dir="${jboss520.home}/bin" perm="+x"
includes="*.sh"/>
+ <chmod dir="${jboss600.home}/bin" perm="+x"
includes="*.sh"/>
</target>
- <target name="undeploy-jboss520" depends="target-jboss520,init"
description="Remove jbossws from jboss520">
- <fail message="Not available: ${jboss520.available.file}"
unless="jboss520.available"/>
- <macro-undeploy-jbossws targetdir="${jboss520.server}"
defaultconf="${jbossws.default.deploy.conf}"
modifyjbossintegration="false"/><!-- [JBWS-2505] -->
+ <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"/><!-- [JBWS-2505] -->
</target>
<!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-6.0.x -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss60"
depends="prepare-deploy">
+ <target name="deploy-structure-jboss601"
depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-metro" inheritall="false">
<param name="installserver"
value="${deploy.structure}/server/${jboss.server.instance}"/>
@@ -172,27 +172,27 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss600 -->
+ <!-- Deployment JBoss601 -->
<!-- ================================================================== -->
- <target name="target-jboss600">
+ <target name="target-jboss601">
<property name="jboss.server.instance" value="default"/>
- <property name="jbossws.integration.target"
value="jboss600"/>
+ <property name="jbossws.integration.target"
value="jboss601"/>
<echo
message="jbossws.integration.target=${jbossws.integration.target}${line.separator}"
file="${target.properties.file}"/>
<echo
message="jboss.server.instance=${jboss.server.instance}${line.separator}"
file="${target.properties.file}" append="true"/>
</target>
- <target name="deploy-jboss600"
depends="undeploy-jboss600,deploy-structure-jboss60" description="Deploy
jbossws to jboss600">
- <fail message="Not available: ${jboss600.available.file}"
unless="jboss600.available"/>
- <copy todir="${jboss600.home}" overwrite="true">
+ <target name="deploy-jboss601"
depends="undeploy-jboss601,deploy-structure-jboss601" description="Deploy
jbossws to jboss601">
+ <fail message="Not available: ${jboss601.available.file}"
unless="jboss601.available"/>
+ <copy todir="${jboss601.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
</copy>
- <chmod dir="${jboss600.home}/bin" perm="+x"
includes="*.sh"/>
+ <chmod dir="${jboss601.home}/bin" perm="+x"
includes="*.sh"/>
</target>
- <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"/><!-- [JBWS-2505] -->
+ <target name="undeploy-jboss601" depends="target-jboss601,init"
description="Remove jbossws from jboss601">
+ <fail message="Not available: ${jboss601.available.file}"
unless="jboss601.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss601.server}"
defaultconf="${jbossws.default.deploy.conf}"
modifyjbossintegration="false"/><!-- [JBWS-2505] -->
</target>
<!-- ================================================================== -->
Modified: stack/metro/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-setup.xml 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/src/main/distro/build-setup.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -41,13 +41,6 @@
<property name="jboss510.server.deploy"
value="${jboss510.server}/deploy"/>
<property name="jboss510.server.deployers"
value="${jboss510.server}/deployers"/>
- <property name="jboss520.lib"
value="${jboss520.home}/lib"/>
- <property name="jboss520.client"
value="${jboss520.home}/client"/>
- <property name="jboss520.server"
value="${jboss520.home}/server/${jboss.server.instance}"/>
- <property name="jboss520.server.lib"
value="${jboss520.home}/common/lib"/>
- <property name="jboss520.server.deploy"
value="${jboss520.server}/deploy"/>
- <property name="jboss520.server.deployers"
value="${jboss520.server}/deployers"/>
-
<property name="jboss600.lib"
value="${jboss600.home}/lib"/>
<property name="jboss600.client"
value="${jboss600.home}/client"/>
<property name="jboss600.server"
value="${jboss600.home}/server/${jboss.server.instance}"/>
@@ -55,17 +48,24 @@
<property name="jboss600.server.deploy"
value="${jboss600.server}/deploy"/>
<property name="jboss600.server.deployers"
value="${jboss600.server}/deployers"/>
+ <property name="jboss601.lib"
value="${jboss601.home}/lib"/>
+ <property name="jboss601.client"
value="${jboss601.home}/client"/>
+ <property name="jboss601.server"
value="${jboss601.home}/server/${jboss.server.instance}"/>
+ <property name="jboss601.server.lib"
value="${jboss601.home}/common/lib"/>
+ <property name="jboss601.server.deploy"
value="${jboss601.server}/deploy"/>
+ <property name="jboss601.server.deployers"
value="${jboss601.server}/deployers"/>
+
<property name="jboss500.available.file"
value="${jboss500.client}/jboss-client.jar"/>
<property name="jboss501.available.file"
value="${jboss501.client}/jboss-client.jar"/>
<property name="jboss510.available.file"
value="${jboss510.client}/jboss-client.jar"/>
- <property name="jboss520.available.file"
value="${jboss520.client}/jboss-client.jar"/>
<property name="jboss600.available.file"
value="${jboss600.client}/jboss-client.jar"/>
+ <property name="jboss601.available.file"
value="${jboss601.client}/jboss-client.jar"/>
<available property="jboss500.available"
file="${jboss500.available.file}"/>
<available property="jboss501.available"
file="${jboss501.available.file}"/>
<available property="jboss510.available"
file="${jboss510.available.file}"/>
- <available property="jboss520.available"
file="${jboss520.available.file}"/>
<available property="jboss600.available"
file="${jboss600.available.file}"/>
+ <available property="jboss601.available"
file="${jboss601.available.file}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/metro/trunk/src/main/distro/build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build.xml 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/src/main/distro/build.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -56,14 +56,10 @@
<equals arg1="${jbossws.integration.target}"
arg2="jboss510"/>
</or>
</condition>
- <condition property="jbossws.integration.jboss52"
value="true">
- <or>
- <equals arg1="${jbossws.integration.target}"
arg2="jboss520"/>
- </or>
- </condition>
<condition property="jbossws.integration.jboss60"
value="true">
<or>
<equals arg1="${jbossws.integration.target}"
arg2="jboss600"/>
+ <equals arg1="${jbossws.integration.target}"
arg2="jboss601"/>
</or>
</condition>
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-09 20:38:07
UTC (rev 11236)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-09 20:41:08
UTC (rev 11237)
@@ -110,17 +110,17 @@
<!--
<dependencySet>
<outputDirectory>lib</outputDirectory>
-
<outputFileNameMapping>jbossws-jboss520.${module.extension}</outputFileNameMapping>
+
<outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss520x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss600:jar</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>lib</outputDirectory>
-
<outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
+
<outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>false</unpack>