[jbossws-commits] JBossWS SVN: r10141 - in stack/native/trunk: modules/core and 6 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri May 29 02:57:11 EDT 2009
Author: richard.opalka at jboss.com
Date: 2009-05-29 02:57:11 -0400 (Fri, 29 May 2009)
New Revision: 10141
Added:
stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt
Modified:
stack/native/trunk/build.xml
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
stack/native/trunk/modules/management/pom.xml
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
stack/native/trunk/profiles.xml.example
stack/native/trunk/src/main/distro/Install.txt
stack/native/trunk/src/main/distro/ant.properties.example
stack/native/trunk/src/main/distro/build-deploy.xml
stack/native/trunk/src/main/distro/build-setup.xml
stack/native/trunk/src/main/distro/build.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
adding AS 5.2.x support
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/build.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -59,6 +59,9 @@
<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>
@@ -68,12 +71,14 @@
<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}"/>
<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}"/>
</target>
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/modules/core/pom.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -206,16 +206,24 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
</artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510</artifactId>
+ <version>${jbossws.jboss510.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory>
+ </artifactItem>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
- <version>${jbossws.jboss510.version}</version>
+ <artifactId>jbossws-jboss520x</artifactId>
+ <version>${jbossws.jboss520.version}</version>
<classifier>resources</classifier>
<type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss520</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -57,6 +57,16 @@
</deployment> </footer>
</concat>
+ <!-- Concat jbossws-jboss520/jbossws.beans -->
+ <echo message="Concat jbossws-jboss520/jbossws.beans"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-jboss520/jbossws.beans/META-INF/jboss-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
+ <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
<!-- Concat jbossws-jboss600/jbossws.beans -->
<echo message="Concat jbossws-jboss600/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/jboss-beans.xml">
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/modules/management/pom.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -39,12 +39,17 @@
<artifactId>jbossws-jboss501</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
+ <artifactId>jbossws-jboss520x</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -135,6 +135,21 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-lib52">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.patternset"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/wstx.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<macrodef name="macro-deploy-jbossws-lib60">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -195,6 +210,21 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
+ <include name="**/jbossws-@{jbossid}.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-client52">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.client.patternset"/>
<!-- JBWS-2505 -->
<!-- START -->
<!--
@@ -258,6 +288,20 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-server-lib52">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.server.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<macrodef name="macro-deploy-jbossws-server-lib60">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -329,6 +373,21 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-sar52">
+ <attribute name="thirdpartydir"/>
+ <attribute name="artifactsdir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <unzip dest="@{targetdir}/jbossws-management.war">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-native-management.war"/>
+ </fileset>
+ </unzip>
+ </sequential>
+ </macrodef>
+
<macrodef name="macro-deploy-jbossws-sar60">
<attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
@@ -411,6 +470,43 @@
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-@{jbossid}.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
+ <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-deployers52">
+ <attribute name="thirdpartydir"/>
+ <attribute name="artifactsdir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}">
+ <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}/jbossws.beans">
+ <include name="META-INF/**"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/META-INF">
+ <fileset dir="@{artifactsdir}/resources">
+ <include name="standard-*-config.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
@@ -507,6 +603,17 @@
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
+ <target name="deploy-jbossws-native52" depends="check-parameters">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
+ <macro-deploy-jbossws-client52 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib52 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib52 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
+ <macro-deploy-jbossws-sar52 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deployers52 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
+ </target>
+
<target name="deploy-jbossws-native60" depends="check-parameters">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client60 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
@@ -580,6 +687,42 @@
<available property="jboss.undeploy.client" file="${jboss.home}/client"/>
<fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
+ <!-- delete stale container integration jars -->
+ <delete>
+ <fileset dir="${jboss.server.home}">
+ <include name="**/jbossws-jboss*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/client">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
+ </delete>
+
+ <!-- delete content of last deployment -->
+ <delete>
+ <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
+ </delete>
+
+ <!-- delete jbossws.sar -->
+ <delete dir="@{targetdir}"/>
+
+ <!-- delete juddi-service.sar -->
+ <delete dir="@{targetdir}/../juddi-service.sar"/>
+
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-jbossws52">
+ <attribute name="defaultconf"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
+
+ <property name="jboss.server.home" value="@{targetdir}/../.."/>
+ <property name="jboss.home" value="${jboss.server.home}/../.."/>
+ <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
+ <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
+
<!-- [JBWS-2505] -->
<!-- START -->
<!-- delete stale container integration jars -->
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/modules/testsuite/pom.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -429,16 +429,77 @@
<profile>
<id>jboss510</id>
<properties>
- <jboss.version>5.1.0-SNAPSHOT</jboss.version>
+ <jboss.version>5.1.0.GA</jboss.version>
<jbossws.integration.target>jboss510</jbossws.integration.target>
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
+ <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine>
+ <!-- TODO: replace with maven dependencies -->
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss520
+ Descr: JBoss-5.2.0 specific options
+ -->
+ <profile>
+ <id>jboss520</id>
+ <properties>
+ <jboss.version>5.2.0-SNAPSHOT</jboss.version>
+ <jbossws.integration.target>jboss520</jbossws.integration.target>
+ </properties>
+ <dependencies>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
+ <artifactId>jbossws-jboss520x</artifactId>
<exclusions>
<exclusion>
<groupId>jboss.jbossws</groupId>
@@ -475,13 +536,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile>
+ <testExcludeFile>../test-excludes-jboss520.txt</testExcludeFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss520.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
Added: stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt (rev 0)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-05-29 06:57:11 UTC (rev 10141)
@@ -0,0 +1,8 @@
+# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
+org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
+
+# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+
+# [JBWS-2217] Fix BPEL jaxrpc samples
+org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/pom.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -52,11 +52,12 @@
<jbossws.spi.version>1.2.0-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss500.version>3.2.0-SNAPSHOT</jbossws.jboss500.version>
<jbossws.jboss501.version>3.2.0-SNAPSHOT</jbossws.jboss501.version>
+ <jbossws.jboss510.version>3.2.0-SNAPSHOT</jbossws.jboss510.version>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
- <jbossws.jboss510.version>3.1.2-SNAPSHOT</jbossws.jboss510.version>
- <jbossws.jboss600.version>3.1.2-SNAPSHOT</jbossws.jboss600.version>
+ <jbossws.jboss520.version>3.2.0-SNAPSHOT</jbossws.jboss520.version>
+ <jbossws.jboss600.version>3.2.0-SNAPSHOT</jbossws.jboss600.version>
-->
<!-- END -->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
@@ -131,18 +132,30 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510</artifactId>
+ <version>${jbossws.jboss510.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510</artifactId>
+ <version>${jbossws.jboss510.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
- <version>${jbossws.jboss510.version}</version>
+ <artifactId>jbossws-jboss520x</artifactId>
+ <version>${jbossws.jboss520.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
- <version>${jbossws.jboss510.version}</version>
+ <artifactId>jbossws-jboss520x</artifactId>
+ <version>${jbossws.jboss520.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
@@ -489,6 +502,18 @@
</profile>
<!--
+ Name: jboss520
+ Descr: JBoss-5.2.0 specific options
+ -->
+ <profile>
+ <id>jboss520</id>
+ <properties>
+ <jbossws.integration.target>jboss520</jbossws.integration.target>
+ <jboss.home>${jboss520.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
Name: jboss600
Descr: JBoss-6.0.0 specific options
-->
Modified: stack/native/trunk/profiles.xml.example
===================================================================
--- stack/native/trunk/profiles.xml.example 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/profiles.xml.example 2009-05-29 06:57:11 UTC (rev 10141)
@@ -13,8 +13,9 @@
<properties>
<java.jdk15.home>/usr/java/jdk1.5</java.jdk15.home>
<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/branches/Branch_5_0/build/output/jboss-5.0.1.GA</jboss501.home>
- <jboss510.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.GA</jboss510.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.Alpha1</jboss600.home>
</properties>
</profile>
Modified: stack/native/trunk/src/main/distro/Install.txt
===================================================================
--- stack/native/trunk/src/main/distro/Install.txt 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/src/main/distro/Install.txt 2009-05-29 06:57:11 UTC (rev 10141)
@@ -13,9 +13,11 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss50x
- ant deploy-jboss51x
- ant deploy-jboss60x
+ ant deploy-jboss500
+ ant deploy-jboss501
+ ant deploy-jboss510
+ ant deploy-jboss520
+ ant deploy-jboss600
4.) Execute the samples to verify your installation
Modified: stack/native/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/native/trunk/src/main/distro/ant.properties.example 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/src/main/distro/ant.properties.example 2009-05-29 06:57:11 UTC (rev 10141)
@@ -6,10 +6,11 @@
jboss500.home=@jboss500.home@
jboss501.home=@jboss501.home@
jboss510.home=@jboss510.home@
+jboss520.home=@jboss520.home@
jboss600.home=@jboss600.home@
-# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss600]
-jbossws.integration.target=jboss500
+# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss520|jboss600]
+jbossws.integration.target=jboss510
# The JBoss settings
jboss.server.instance=default
Modified: stack/native/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-deploy.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/src/main/distro/build-deploy.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -108,6 +108,43 @@
</target>
<!-- ================================================================== -->
+ <!-- Prepare Deployment Structure JBoss-5.2.x -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-jboss52" depends="prepare-deploy">
+ <delete dir="${deploy.structure}"/>
+ <antcall target="deploy-jbossws-native52" inheritall="false">
+ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
+ <param name="jbossid" value="${jbossws.integration.target}"/>
+ <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss520 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss520">
+ <property name="jbossws.integration.target" value="jboss520"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </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">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss520.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-jbossws52 targetdir="${jboss520.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-6.0.x -->
<!-- ================================================================== -->
Modified: stack/native/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-setup.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/src/main/distro/build-setup.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -42,6 +42,13 @@
<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}"/>
@@ -52,11 +59,13 @@
<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"/>
<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}"/>
<tstamp>
Modified: stack/native/trunk/src/main/distro/build.xml
===================================================================
--- stack/native/trunk/src/main/distro/build.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/src/main/distro/build.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -56,6 +56,11 @@
<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"/>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-05-28 16:44:04 UTC (rev 10140)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-05-29 06:57:11 UTC (rev 10141)
@@ -98,17 +98,27 @@
<include>org.jboss.ws:jbossws-jboss501:jar</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.jboss.ws:jbossws-jboss510:jar</include>
+ </includes>
+ </dependencySet>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
+ <outputFileNameMapping>jbossws-jboss520.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss510x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss520x:jar</include>
</includes>
</dependencySet>
<dependencySet>
More information about the jbossws-commits
mailing list