JBossWS SVN: r5674 - in stack/cxf/trunk: ant-import and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-14 08:06:45 -0500 (Thu, 14 Feb 2008)
New Revision: 5674
Added:
stack/cxf/trunk/ant-import/macros-deploy-cxf.xml
stack/cxf/trunk/ant-import/macros-deploy-framework.xml
stack/cxf/trunk/src/main/etc/bin-dist-build.xml
stack/cxf/trunk/src/main/etc/bin-dist-deploy.xml
Modified:
stack/cxf/trunk/ant-import/
stack/cxf/trunk/ant-import/build-bin-dist.xml
stack/cxf/trunk/ant-import/build-deploy.xml
stack/cxf/trunk/ant-import/build-setup.xml
stack/cxf/trunk/ant-import/build-thirdparty.xml
stack/cxf/trunk/ant.properties.example
stack/cxf/trunk/src/main/distro/bin-dist-build.xml
stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml
stack/cxf/trunk/version.properties
Log:
Rollback: [JBWS-1982] Simplify deploy/undeploy cycles for different stacks
Add deploy-jboss501
Property changes on: stack/cxf/trunk/ant-import
___________________________________________________________________
Name: svn:ignore
- macros-deploy-native.xml
macros-deploy-framework.xml
macros-deploy-sunri.xml
macros-deploy-cxf.xml
Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-02-14 13:02:55 UTC (rev 5673)
+++ stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-02-14 13:06:45 UTC (rev 5674)
@@ -50,10 +50,8 @@
<!-- build -->
<copy todir="${bindist.build.dir}">
<fileset dir="${cxf.dir}/ant-import">
- <include name="macros-deploy-cxf.xml"/>
- <include name="macros-deploy-sunri.xml"/>
- <include name="macros-deploy-native.xml"/>
<include name="macros-deploy-framework.xml"/>
+ <include name="macros-deploy-cxf.xml"/>
</fileset>
</copy>
Modified: stack/cxf/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-deploy.xml 2008-02-14 13:02:55 UTC (rev 5673)
+++ stack/cxf/trunk/ant-import/build-deploy.xml 2008-02-14 13:06:45 UTC (rev 5674)
@@ -13,75 +13,91 @@
<project>
- <import file="${int.cxf.dir}/ant-import/macros-deploy-framework.xml" optional="true"/>
- <import file="${int.cxf.dir}/ant-import/macros-deploy-cxf.xml" optional="true"/>
- <import file="${int.cxf.dir}/ant-import/macros-deploy-sunri.xml" optional="true"/>
- <import file="${int.cxf.dir}/ant-import/macros-deploy-native.xml" optional="true"/>
-
+ <import file="${int.cxf.dir}/ant-import/macros-deploy-framework.xml"/>
+ <import file="${int.cxf.dir}/ant-import/macros-deploy-cxf.xml"/>
+
<!-- ================================================================== -->
- <!-- Deployment JBoss422 -->
+ <!-- Deployment JBoss-4.2.2 -->
<!-- ================================================================== -->
-
+
+ <!-- Deploy to jboss422 -->
<target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/cxf to jboss422">
<macro-deploy-cxf422
stacklibs="${int.cxf.dir}/output/lib"
thirdpartylibs="${int.cxf.dir}/thirdparty"/>
-
- <macro-deploy-framework
- thirdpartylibs="${int.cxf.dir}/thirdparty"
- jbosshome="${jboss422.home}"/>
+
+ <macro-deploy-framework
+ thirdpartylibs="${int.cxf.dir}/thirdparty"
+ jbosshome="${jboss422.home}"/>
</target>
+ <!-- Remove from jboss422 -->
<target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss422">
<macro-undeploy-cxf422/>
- <macro-undeploy-sunri422/>
- <macro-undeploy-native422/>
- <macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
- <macro-undeploy-framework jbosshome="${jboss422.home}"/>
+ <macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss423 -->
+ <!-- Deployment JBoss-4.2.3 -->
<!-- ================================================================== -->
-
+
+ <!-- Deploy to jboss423 -->
<target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423" description="Deploy jbossws/cxf to jboss423">
<macro-deploy-cxf423
stacklibs="${int.cxf.dir}/output/lib"
thirdpartylibs="${int.cxf.dir}/thirdparty"/>
-
- <macro-deploy-framework
- thirdpartylibs="${int.cxf.dir}/thirdparty"
- jbosshome="${jboss423.home}"/>
+
+ <macro-deploy-framework
+ thirdpartylibs="${int.cxf.dir}/thirdparty"
+ jbosshome="${jboss423.home}"/>
</target>
-
+
+ <!-- Remove from jboss423 -->
<target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/cxf from jboss423">
<macro-undeploy-cxf423/>
- <macro-undeploy-sunri423/>
- <macro-undeploy-native423/>
- <macro-undeploy-endorsed jbosshome="${jboss423.home}"/>
- <macro-undeploy-framework jbosshome="${jboss423.home}"/>
+ <macro-undeploy-framework jbosshome="${jboss423.home}"/>
</target>
-
+
<!-- ================================================================== -->
- <!-- Deployment JBoss500 -->
+ <!-- Deployment JBoss-5.0.0 -->
<!-- ================================================================== -->
-
+
+ <!-- Deploy to jboss500 -->
<target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/cxf to jboss500">
<macro-deploy-cxf500
stacklibs="${int.cxf.dir}/output/lib"
thirdpartylibs="${int.cxf.dir}/thirdparty"/>
- <macro-deploy-framework
- thirdpartylibs="${int.cxf.dir}/thirdparty"
- jbosshome="${jboss500.home}"/>
+ <macro-deploy-framework
+ thirdpartylibs="${int.cxf.dir}/thirdparty"
+ jbosshome="${jboss500.home}"/>
</target>
-
+
+ <!-- Remove from jboss500 -->
<target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss500">
<macro-undeploy-cxf500/>
- <macro-undeploy-sunri500/>
- <macro-undeploy-native500/>
- <macro-undeploy-endorsed jbosshome="${jboss500.home}"/>
- <macro-undeploy-framework jbosshome="${jboss500.home}"/>
+ <macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss-5.0.1 -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy to jboss501 -->
+ <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501" description="Deploy jbossws/cxf to jboss501">
+ <macro-deploy-cxf501
+ stacklibs="${int.cxf.dir}/output/lib"
+ thirdpartylibs="${int.cxf.dir}/thirdparty"/>
+ <macro-deploy-framework
+ thirdpartylibs="${int.cxf.dir}/thirdparty"
+ jbosshome="${jboss501.home}"/>
+ </target>
+
+ <!-- Remove from jboss501 -->
+ <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/cxf from jboss501">
+ <macro-undeploy-cxf501/>
+ <macro-undeploy-framework jbosshome="${jboss501.home}"/>
+ </target>
+
</project>
Modified: stack/cxf/trunk/ant-import/build-setup.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-setup.xml 2008-02-14 13:02:55 UTC (rev 5673)
+++ stack/cxf/trunk/ant-import/build-setup.xml 2008-02-14 13:06:45 UTC (rev 5674)
@@ -43,15 +43,24 @@
<property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
<property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
+ <property name="jboss501.lib" value="${jboss501.home}/lib"/>
+ <property name="jboss501.client" value="${jboss501.home}/client"/>
+ <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
+ <property name="jboss501.server.lib" value="${jboss501.server}/lib"/>
+ <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
+ <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
+
<property name="jboss.server.instance.${jboss.server.instance}" value="true"/>
<property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
<property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss501.available.file" value="${jboss501.client}/jboss-ejb3-client.jar"/>
<available property="jboss422.available" file="${jboss422.available.file}"/>
<available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss501.available" file="${jboss501.available.file}"/>
<condition property="jbossws.integration.jboss42" value="true">
<or>
@@ -60,7 +69,10 @@
</or>
</condition>
<condition property="jbossws.integration.jboss50" value="true">
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
+ </or>
</condition>
<available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-02-14 13:02:55 UTC (rev 5673)
+++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-02-14 13:06:45 UTC (rev 5674)
@@ -47,7 +47,6 @@
description="Gets the thirdparty libraries">
<mkdir dir="${thirdparty.dir}"/>
- <get src="${jboss.repository}/jboss/jbossws-macros/${jbossws-macros}/lib/jbossws-macros-src.zip" dest="${thirdparty.dir}/jbossws-macros-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common-src.zip" dest="${thirdparty.dir}/jbossws-common-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/>
@@ -73,7 +72,7 @@
<get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/>
- <unzip dest="${basedir}/ant-import" src="${thirdparty.dir}/jbossws-macros-src.zip"/>
+
<checksum file="${int.cxf.dir}/version.properties" fileext=".md5"/>
</target>
Copied: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml (from rev 5488, stack/cxf/trunk/ant-import/macros-deploy-cxf.xml)
===================================================================
--- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml (rev 0)
+++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-14 13:06:45 UTC (rev 5674)
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss-4.2.2 -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/cxf to jboss422 -->
+ <macrodef name="macro-deploy-cxf422">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss422.home}/client" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- BOOTSTRAP JARS -->
+ <copy todir="${jboss422.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+
+ <!--SERVER JARS -->
+ <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
+ <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src="@{stacklibs}/jbossws-cxf42.sar"/>
+ <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Undeploy jbossws/cxf from jboss422 -->
+ <macrodef name="macro-undeploy-cxf422">
+ <sequential>
+ <delete>
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss422.home}/client">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </delete>
+
+ <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
+ <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss-4.2.3 -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/cxf to jboss423 -->
+ <macrodef name="macro-deploy-cxf423">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss423.home}/client" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- BOOTSTRAP JARS -->
+ <copy todir="${jboss423.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+
+ <!--SERVER JARS -->
+ <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
+ <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src="@{stacklibs}/jbossws-cxf42.sar"/>
+ <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Undeploy jbossws/cxf from jboss423 -->
+ <macrodef name="macro-undeploy-cxf423">
+ <sequential>
+ <delete>
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss423.home}/client">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </delete>
+
+ <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
+ <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss-5.0.0 -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/cxf to jboss500 -->
+ <macrodef name="macro-deploy-cxf500">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss500.home}/client" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- BOOTSTRAP JARS -->
+ <copy todir="${jboss500.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+
+ <!--SERVER JARS -->
+ <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxws-api-${cxf.jaxws.api}.jar"/>
+ <include name="saaj-api-${cxf.saaj}.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
+ <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src="@{stacklibs}/jbossws-cxf50.sar"/>
+ <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Undeploy jbossws/cxf from jboss500 -->
+ <macrodef name="macro-undeploy-cxf500">
+ <sequential>
+ <delete>
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss500.home}/client">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+
+ <!-- BOOTSTRAP JARS -->
+ <fileset dir="${jboss500.home}/lib">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+
+ <!--SERVER JARS -->
+ <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib">
+ <include name="jaxws-api-${cxf.jaxws.api}.jar"/>
+ <include name="saaj-api-${cxf.saaj}.jar"/>
+ </fileset>
+ </delete>
+
+ <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
+ <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss-5.0.1 -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/cxf to jboss501 -->
+ <macrodef name="macro-deploy-cxf501">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss501.home}/client" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- BOOTSTRAP JARS -->
+ <copy todir="${jboss501.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+
+ <!--SERVER JARS -->
+ <copy todir="${jboss501.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxws-api-${cxf.jaxws.api}.jar"/>
+ <include name="saaj-api-${cxf.saaj}.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
+ <unjar dest="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src="@{stacklibs}/jbossws-cxf50.sar"/>
+ <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Undeploy jbossws/cxf from jboss501 -->
+ <macrodef name="macro-undeploy-cxf501">
+ <sequential>
+ <delete>
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss501.home}/client">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+
+ <!-- BOOTSTRAP JARS -->
+ <fileset dir="${jboss501.home}/lib">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+
+ <!--SERVER JARS -->
+ <fileset dir="${jboss501.home}/server/${jboss.server.instance}/lib">
+ <include name="jaxws-api-${cxf.jaxws.api}.jar"/>
+ <include name="saaj-api-${cxf.saaj}.jar"/>
+ </fileset>
+ </delete>
+
+ <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
+ <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+</project>
Copied: stack/cxf/trunk/ant-import/macros-deploy-framework.xml (from rev 5488, stack/cxf/trunk/ant-import/macros-deploy-framework.xml)
===================================================================
--- stack/cxf/trunk/ant-import/macros-deploy-framework.xml (rev 0)
+++ stack/cxf/trunk/ant-import/macros-deploy-framework.xml 2008-02-14 13:06:45 UTC (rev 5674)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: macros-deploy-spi.xml 3620 2007-06-18 20:39:56Z heiko.braun(a)jboss.com $ -->
+
+<project>
+
+ <macrodef name="macro-deploy-framework">
+ <attribute name="thirdpartylibs"/>
+ <attribute name="jbosshome"/>
+ <sequential>
+
+ <!-- BIN SCRIPTS -->
+ <unzip dest="@{jbosshome}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/>
+ <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- CLIENT JARS-->
+ <copy todir="@{jbosshome}/client">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS-->
+ <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-framework">
+ <attribute name="jbosshome"/>
+ <sequential>
+ <delete>
+ <!-- BIN SCRIPTS -->
+ <fileset dir="@{jbosshome}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS-->
+ <fileset dir="@{jbosshome}/client">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS-->
+ <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </delete>
+ </sequential>
+ </macrodef>
+
+</project>
\ No newline at end of file
Modified: stack/cxf/trunk/ant.properties.example
===================================================================
--- stack/cxf/trunk/ant.properties.example 2008-02-14 13:02:55 UTC (rev 5673)
+++ stack/cxf/trunk/ant.properties.example 2008-02-14 13:06:45 UTC (rev 5674)
@@ -4,11 +4,12 @@
# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
# Optional JBoss Home
-#jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4
#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA
#jboss423.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA
+#jboss500.home=/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4
+#jboss501.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1
-# The JBoss server under test. This can be [jboss422|jboss423|jboss500]
+# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501]
jbossws.integration.target=jboss422
# The JBoss settings
Modified: stack/cxf/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 13:02:55 UTC (rev 5673)
+++ stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 13:06:45 UTC (rev 5674)
@@ -27,13 +27,6 @@
<property file="${basedir}/ant.properties"/>
<property file="${basedir}/version.properties"/>
- <property name="jboss500.lib" value="${jboss500.home}/lib"/>
- <property name="jboss500.client" value="${jboss500.home}/client"/>
- <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
- <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
- <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
- <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
-
<property name="jboss422.lib" value="${jboss422.home}/lib"/>
<property name="jboss422.client" value="${jboss422.home}/client"/>
<property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
@@ -46,24 +39,43 @@
<property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
<property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
+ <property name="jboss500.lib" value="${jboss500.home}/lib"/>
+ <property name="jboss500.client" value="${jboss500.home}/client"/>
+ <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
+ <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
+ <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
+
+ <property name="jboss501.lib" value="${jboss501.home}/lib"/>
+ <property name="jboss501.client" value="${jboss501.home}/client"/>
+ <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
+ <property name="jboss501.server.lib" value="${jboss501.server}/lib"/>
+ <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
+ <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
+
<property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
- <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
<property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss501.available.file" value="${jboss501.client}/jboss-ejb3-client.jar"/>
- <available property="jboss500.available" file="${jboss500.available.file}"/>
<available property="jboss422.available" file="${jboss422.available.file}"/>
<available property="jboss423.available" file="${jboss423.available.file}"/>
+ <available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss501.available" file="${jboss501.available.file}"/>
- <condition property="jbossws.integration.jboss50" value="true">
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
- </condition>
<condition property="jbossws.integration.jboss42" value="true">
- <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
+ </or>
</condition>
- <condition property="jbossws.integration.jboss42" value="true">
- <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
+ <condition property="jbossws.integration.jboss50" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
+ </or>
</condition>
<!-- JDK Detection -->
@@ -73,10 +85,8 @@
<fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
<import file="${basedir}/build/build-deploy.xml"/>
+ <import file="${basedir}/build/macros-deploy-framework.xml"/>
<import file="${basedir}/build/macros-deploy-cxf.xml"/>
- <import file="${basedir}/build/macros-deploy-sunri.xml"/>
- <import file="${basedir}/build/macros-deploy-native.xml"/>
- <import file="${basedir}/build/macros-deploy-framework.xml"/>
<import file="${basedir}/tests/ant-import/build-testsuite.xml"/>
<!-- ================================================================== -->
Modified: stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-14 13:02:55 UTC (rev 5673)
+++ stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-14 13:06:45 UTC (rev 5674)
@@ -14,9 +14,9 @@
<project>
<!-- ================================================================== -->
- <!-- Deployment JBoss422 -->
+ <!-- Deployment JBoss-4.2.2 -->
<!-- ================================================================== -->
-
+
<!-- Deploy jbossws/cxf to jboss422 -->
<target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/cxf to jboss422">
<macro-deploy-cxf422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
@@ -27,16 +27,16 @@
</target>
<!-- Remove jbossws/cxf from jboss422 -->
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss422">
+ <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/cxf from jboss422">
<macro-undeploy-cxf422/>
- <macro-undeploy-sunri422/>
- <macro-undeploy-native422/>
- <macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
<macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
+ <target name="undeploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
+ </target>
<!-- ================================================================== -->
- <!-- Deployment JBoss423 -->
+ <!-- Deployment JBoss-4.2.3 -->
<!-- ================================================================== -->
<!-- Deploy jbossws/cxf to jboss423 -->
@@ -49,16 +49,16 @@
</target>
<!-- Remove jbossws/cxf from jboss423 -->
- <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/cxf from jboss423">
+ <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws/cxf from jboss423">
<macro-undeploy-cxf423/>
- <macro-undeploy-sunri423/>
- <macro-undeploy-native423/>
- <macro-undeploy-endorsed jbosshome="${jboss423.home}"/>
<macro-undeploy-framework jbosshome="${jboss423.home}"/>
</target>
+ <target name="undeploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-undeploy-endorsed jbosshome="${jboss423.home}"/>
+ </target>
<!-- ================================================================== -->
- <!-- Deployment JBoss500 -->
+ <!-- Deployment JBoss-5.0.0 -->
<!-- ================================================================== -->
<!-- Deploy jbossws/cxf to jboss500 -->
@@ -73,10 +73,26 @@
<!-- Remove jbossws/cxf from jboss500 -->
<target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss500">
<macro-undeploy-cxf500/>
- <macro-undeploy-sunri500/>
- <macro-undeploy-native500/>
- <macro-undeploy-endorsed jbosshome="${jboss500.home}"/>
<macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss-5.0.1 -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/cxf to jboss501 -->
+ <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws/cxf to jboss501">
+ <macro-deploy-cxf501 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
+ <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss501.home}"/>
+ </target>
+ <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed jbosshome="${jboss501.home}" thirdpartylibs="${lib.dir}"/>
+ </target>
+
+ <!-- Remove jbossws/cxf from jboss501 -->
+ <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/cxf from jboss501">
+ <macro-undeploy-cxf501/>
+ <macro-undeploy-framework jbosshome="${jboss501.home}"/>
+ </target>
+
</project>
Copied: stack/cxf/trunk/src/main/etc/bin-dist-build.xml (from rev 5488, stack/cxf/trunk/src/main/etc/bin-dist-build.xml)
===================================================================
--- stack/cxf/trunk/src/main/etc/bin-dist-build.xml (rev 0)
+++ stack/cxf/trunk/src/main/etc/bin-dist-build.xml 2008-02-14 13:06:45 UTC (rev 5674)
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="." name="JBossWS-CXF">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="bin.dir" value="${basedir}/bin"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="thirdparty.dir" value="${basedir}/lib"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+ <property name="tests.output.dir" value="${tests.dir}/output"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
+ <property file="${build.dir}/version.properties"/>
+
+ <property name="jboss500.lib" value="${jboss500.home}/lib"/>
+ <property name="jboss500.client" value="${jboss500.home}/client"/>
+ <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
+ <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
+ <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
+
+ <property name="jboss422.lib" value="${jboss422.home}/lib"/>
+ <property name="jboss422.client" value="${jboss422.home}/client"/>
+ <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
+ <property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
+ <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
+
+ <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
+
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
+
+ <available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss422.available" file="${jboss422.available.file}"/>
+
+ <import file="${basedir}/build/build-deploy.xml"/>
+ <import file="${basedir}/build/build-testsuite.xml"/>
+ <import file="${basedir}/build/macros-deploy-spi.xml"/>
+ <import file="${basedir}/build/macros-deploy-native.xml"/>
+ <import file="${basedir}/build/macros-deploy-sunri.xml"/>
+ <import file="${basedir}/build/macros-deploy-cxf.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss500.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss422.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
+ </condition>
+
+ <!-- Define excludesfile -->
+ <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
+
+ </target>
+
+ <target name="tests-init" depends="prepare,tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <pathelement location="${lib.dir}/jbossws-spi.jar"/>
+ <pathelement location="${lib.dir}/cxf-incubator.jar"/>
+ <pathelement location="${lib.dir}/geronimo-javamail.jar"/>
+ <pathelement location="${lib.dir}/geronimo-ws-metadata.jar"/>
+ <pathelement location="${lib.dir}/jaxws-api.jar"/>
+ <pathelement location="${lib.dir}/jdom.jar"/>
+ <pathelement location="${lib.dir}/neethi.jar"/>
+ <pathelement location="${lib.dir}/resolver.jar"/>
+ <pathelement location="${lib.dir}/saaj-api.jar"/>
+ <pathelement location="${lib.dir}/saaj-impl.jar"/>
+ <pathelement location="${lib.dir}/wsdl4j.jar"/>
+ <pathelement location="${lib.dir}/wstx.jar"/>
+ <pathelement location="${lib.dir}/XmlSchema.jar"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ </path>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources">
+ <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ </target>
+
+ <target name="main" depends="most" description="Executes the default target (most)."/>
+
+ <target name="most" depends="tests-main" description="Builds almost everything."/>
+
+</project>
Copied: stack/cxf/trunk/src/main/etc/bin-dist-deploy.xml (from rev 5488, stack/cxf/trunk/src/main/etc/bin-dist-deploy.xml)
===================================================================
--- stack/cxf/trunk/src/main/etc/bin-dist-deploy.xml (rev 0)
+++ stack/cxf/trunk/src/main/etc/bin-dist-deploy.xml 2008-02-14 13:06:45 UTC (rev 5674)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/cxf to jboss50 -->
+ <target name="deploy-jboss500" depends="undeploy-jboss500" description="Deploy jbossws/cxf to jboss50">
+ <macro-undeploy-native50/>
+ <macro-undeploy-sunri50/>
+ <macro-deploy-cxf500
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss500.home}"/>
+ </target>
+
+ <!-- Remove jbossws/cxf from jboss50 -->
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss50">
+ <macro-undeploy-cxf500/>
+ <macro-undeploy-spi jbosshome="${jboss500.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/cxf to jboss42 -->
+ <target name="deploy-jboss422" depends="undeploy-jboss422" description="Deploy jbossws/cxf to jboss42">
+ <macro-undeploy-native42/>
+ <macro-undeploy-sunri42/>
+ <macro-deploy-cxf422
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss422.home}"/>
+ </target>
+
+ <!-- Remove jbossws/cxf from jboss42 -->
+ <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss42">
+ <macro-undeploy-cxf422/>
+ <macro-undeploy-spi jbosshome="${jboss422.home}"/>
+ </target>
+
+</project>
Modified: stack/cxf/trunk/version.properties
===================================================================
--- stack/cxf/trunk/version.properties 2008-02-14 13:02:55 UTC (rev 5673)
+++ stack/cxf/trunk/version.properties 2008-02-14 13:06:45 UTC (rev 5674)
@@ -37,7 +37,6 @@
jbossws-spi=1.0.1.GA
jbossws-common=1.0.3.GA
jbossws-framework=3.0.0.GA
-jbossws-macros=1.0.0.GA
jbossws-jboss42=4.2.1.GA
apache-xml-commons=1.2
16 years, 11 months
JBossWS SVN: r5673 - stack/metro/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-14 08:02:55 -0500 (Thu, 14 Feb 2008)
New Revision: 5673
Modified:
stack/metro/trunk/ant-import/build-metro.xml
Log:
[JBWS-1955] fixing bug
Modified: stack/metro/trunk/ant-import/build-metro.xml
===================================================================
--- stack/metro/trunk/ant-import/build-metro.xml 2008-02-14 12:51:27 UTC (rev 5672)
+++ stack/metro/trunk/ant-import/build-metro.xml 2008-02-14 13:02:55 UTC (rev 5673)
@@ -45,6 +45,7 @@
package="wsit/wsit"
dest="${cvs.dir}"
tag="${cvs.tag}"
+ failonerror="true"
/>
<touch file="checkout_id-${cvs.tag}"/>
16 years, 11 months
JBossWS SVN: r5672 - in stack/metro/trunk: ant-import and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-14 07:51:27 -0500 (Thu, 14 Feb 2008)
New Revision: 5672
Added:
stack/metro/trunk/ant-import/macros-deploy-framework.xml
stack/metro/trunk/ant-import/macros-deploy-sunri.xml
stack/metro/trunk/src/main/etc/bin-dist-build.xml
stack/metro/trunk/src/main/etc/bin-dist-deploy.xml
Modified:
stack/metro/trunk/ant-import/
stack/metro/trunk/ant-import/build-bin-dist.xml
stack/metro/trunk/ant-import/build-deploy.xml
stack/metro/trunk/ant-import/build-setup.xml
stack/metro/trunk/ant-import/build-thirdparty.xml
stack/metro/trunk/ant.properties.example
stack/metro/trunk/build.xml
stack/metro/trunk/src/main/distro/bin-dist-build.xml
stack/metro/trunk/src/main/distro/bin-dist-deploy.xml
stack/metro/trunk/version.properties
Log:
Add AS-5.0.1. Cannot test because of [JBWS-1955]
Property changes on: stack/metro/trunk/ant-import
___________________________________________________________________
Name: svn:ignore
- macros-deploy-native.xml
macros-deploy-framework.xml
macros-deploy-sunri.xml
macros-deploy-cxf.xml
Modified: stack/metro/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/metro/trunk/ant-import/build-bin-dist.xml 2008-02-14 12:45:30 UTC (rev 5671)
+++ stack/metro/trunk/ant-import/build-bin-dist.xml 2008-02-14 12:51:27 UTC (rev 5672)
@@ -50,10 +50,8 @@
<!-- build -->
<copy todir="${bindist.build.dir}">
<fileset dir="${sunri.dir}/ant-import">
- <include name="macros-deploy-cxf.xml"/>
- <include name="macros-deploy-sunri.xml"/>
- <include name="macros-deploy-native.xml"/>
<include name="macros-deploy-framework.xml"/>
+ <include name="macros-deploy-sunri.xml"/>
</fileset>
</copy>
@@ -156,4 +154,4 @@
</zip>
</target>
-</project>
+</project>
\ No newline at end of file
Modified: stack/metro/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/metro/trunk/ant-import/build-deploy.xml 2008-02-14 12:45:30 UTC (rev 5671)
+++ stack/metro/trunk/ant-import/build-deploy.xml 2008-02-14 12:51:27 UTC (rev 5672)
@@ -13,13 +13,11 @@
<project>
- <import file="${int.sunri.dir}/ant-import/macros-deploy-framework.xml" optional="true"/>
- <import file="${int.sunri.dir}/ant-import/macros-deploy-cxf.xml" optional="true"/>
- <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml" optional="true"/>
- <import file="${int.sunri.dir}/ant-import/macros-deploy-native.xml" optional="true"/>
+ <import file="${int.sunri.dir}/ant-import/macros-deploy-framework.xml"/>
+ <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/>
<!-- ================================================================== -->
- <!-- Deployment JBoss422 -->
+ <!-- Deployment JBoss422 -->
<!-- ================================================================== -->
<target name="deploy-jboss422" depends="jars-jboss422,undeploy-jboss422" description="Deploy jbossws/sunri to jboss42">
@@ -33,15 +31,12 @@
</target>
<target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss42">
- <macro-undeploy-cxf422/>
<macro-undeploy-sunri422/>
- <macro-undeploy-native422/>
- <macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
<macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss423 -->
+ <!-- Deployment JBoss423 -->
<!-- ================================================================== -->
<target name="deploy-jboss423" depends="jars-jboss423, undeploy-jboss423" description="Deploy jbossws/sunri to jboss42">
@@ -55,15 +50,12 @@
</target>
<target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/sunri from jboss42">
- <macro-undeploy-cxf423/>
<macro-undeploy-sunri423/>
- <macro-undeploy-native423/>
- <macro-undeploy-endorsed jbosshome="${jboss423.home}"/>
<macro-undeploy-framework jbosshome="${jboss423.home}"/>
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss500 -->
+ <!-- Deployment JBoss500 -->
<!-- ================================================================== -->
<target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/sunri to jboss50">
@@ -77,11 +69,27 @@
</target>
<target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50">
- <macro-undeploy-cxf500/>
<macro-undeploy-sunri500/>
- <macro-undeploy-native500/>
- <macro-undeploy-endorsed jbosshome="${jboss500.home}"/>
<macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss501 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501" description="Deploy jbossws/sunri to jboss50">
+ <macro-deploy-sunri501
+ stacklibs="${int.sunri.dir}/output/lib"
+ thirdpartylibs="${int.sunri.dir}/thirdparty"/>
+
+ <macro-deploy-framework
+ thirdpartylibs="${int.sunri.dir}/thirdparty"
+ jbosshome="${jboss501.home}"/>
+ </target>
+
+ <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/sunri from jboss50">
+ <macro-undeploy-sunri501/>
+ <macro-undeploy-framework jbosshome="${jboss501.home}"/>
+ </target>
+
</project>
Modified: stack/metro/trunk/ant-import/build-setup.xml
===================================================================
--- stack/metro/trunk/ant-import/build-setup.xml 2008-02-14 12:45:30 UTC (rev 5671)
+++ stack/metro/trunk/ant-import/build-setup.xml 2008-02-14 12:51:27 UTC (rev 5672)
@@ -43,15 +43,24 @@
<property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
<property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
+ <property name="jboss501.lib" value="${jboss501.home}/lib"/>
+ <property name="jboss501.client" value="${jboss501.home}/client"/>
+ <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
+ <property name="jboss501.server.lib" value="${jboss501.server}/lib"/>
+ <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
+ <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
+
<property name="jboss.server.instance.${jboss.server.instance}" value="true"/>
<property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
<property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss501.available.file" value="${jboss501.client}/jboss-ejb3-client.jar"/>
<available property="jboss422.available" file="${jboss422.available.file}"/>
<available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss501.available" file="${jboss501.available.file}"/>
<condition property="jbossws.integration.jboss42" value="true">
<or>
@@ -60,7 +69,10 @@
</or>
</condition>
<condition property="jbossws.integration.jboss50" value="true">
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
+ </or>
</condition>
<available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
Modified: stack/metro/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-02-14 12:45:30 UTC (rev 5671)
+++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-02-14 12:51:27 UTC (rev 5672)
@@ -45,7 +45,6 @@
<get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-macros/${jbossws-macros}/lib/jbossws-macros-src.zip" dest="${thirdparty.dir}/jbossws-macros-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
@@ -79,7 +78,6 @@
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/>
- <unzip dest="${basedir}/ant-import" src="${thirdparty.dir}/jbossws-macros-src.zip"/>
<checksum file="${int.sunri.dir}/version.properties" fileext=".md5"/>
</target>
Copied: stack/metro/trunk/ant-import/macros-deploy-framework.xml (from rev 5572, stack/metro/trunk/ant-import/macros-deploy-framework.xml)
===================================================================
--- stack/metro/trunk/ant-import/macros-deploy-framework.xml (rev 0)
+++ stack/metro/trunk/ant-import/macros-deploy-framework.xml 2008-02-14 12:51:27 UTC (rev 5672)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: macros-deploy-spi.xml 3620 2007-06-18 20:39:56Z heiko.braun(a)jboss.com $ -->
+
+<project>
+
+ <macrodef name="macro-deploy-framework">
+ <attribute name="thirdpartylibs"/>
+ <attribute name="jbosshome"/>
+ <sequential>
+
+ <!-- BIN SCRIPTS -->
+ <unzip dest="@{jbosshome}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/>
+ <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- CLIENT JARS-->
+ <copy todir="@{jbosshome}/client">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS-->
+ <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-framework">
+ <attribute name="jbosshome"/>
+ <sequential>
+ <delete>
+ <!-- BIN SCRIPTS -->
+ <fileset dir="@{jbosshome}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS-->
+ <fileset dir="@{jbosshome}/client">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS-->
+ <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </delete>
+ </sequential>
+ </macrodef>
+
+</project>
Copied: stack/metro/trunk/ant-import/macros-deploy-sunri.xml (from rev 5572, stack/metro/trunk/ant-import/macros-deploy-sunri.xml)
===================================================================
--- stack/metro/trunk/ant-import/macros-deploy-sunri.xml (rev 0)
+++ stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2008-02-14 12:51:27 UTC (rev 5672)
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <patternset id="client.stack.patternset">
+ <include name="jbossws-sunri-client.jar"/>
+ </patternset>
+
+ <patternset id="client.patternset">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
+ </patternset>
+
+ <patternset id="lib.patternset">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </patternset>
+
+ <patternset id="serverlib.patternset">
+ <include name="jaxws-api.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="saaj-api.jar"/>
+ </patternset>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss422 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-sunri422">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+ <copy todir="${jboss422.home}/client" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <patternset refid="client.stack.patternset"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="client.patternset"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss422.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri42.sar"/>
+ <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/sunri from jboss422 -->
+ <macrodef name="macro-undeploy-sunri422">
+ <sequential>
+ <delete>
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss422.home}/client">
+ <patternset refid="client.stack.patternset"/>
+ <patternset refid="client.patternset"/>
+ </fileset>
+
+ <!-- BOOTSTRAP JARS -->
+ <fileset dir="${jboss422.home}/lib">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+ </delete>
+
+ <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss423 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-sunri423">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+ <copy todir="${jboss423.home}/client" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <patternset refid="client.stack.patternset"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="client.patternset"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss423.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri42.sar"/>
+ <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/sunri from jboss423 -->
+ <macrodef name="macro-undeploy-sunri423">
+ <sequential>
+ <delete>
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss423.home}/client">
+ <patternset refid="client.stack.patternset"/>
+ <patternset refid="client.patternset"/>
+ </fileset>
+
+ <!-- BOOTSTRAP JARS -->
+ <fileset dir="${jboss423.home}/lib">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+ </delete>
+
+ <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss500 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-sunri500">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss500.home}/client" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <patternset refid="client.stack.patternset"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="client.patternset"/>
+ </fileset>
+ </copy>
+
+ <!-- BOOTSTRAP JARS -->
+ <copy todir="${jboss500.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+ </copy>
+
+ <!--SERVER JARS -->
+ <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="serverlib.patternset"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri50.sar"/>
+ <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/sunri from jboss500 -->
+ <macrodef name="macro-undeploy-sunri500">
+ <sequential>
+ <delete>
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss500.home}/client">
+ <patternset refid="client.stack.patternset"/>
+ <patternset refid="client.patternset"/>
+ </fileset>
+
+ <!-- BOOTSTRAP JARS -->
+ <fileset dir="${jboss500.home}/lib">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib">
+ <patternset refid="serverlib.patternset"/>
+ </fileset>
+ </delete>
+
+ <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss501 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-sunri501">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss501.home}/client" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <patternset refid="client.stack.patternset"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="client.patternset"/>
+ </fileset>
+ </copy>
+
+ <!-- BOOTSTRAP JARS -->
+ <copy todir="${jboss501.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+ </copy>
+
+ <!--SERVER JARS -->
+ <copy todir="${jboss501.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="serverlib.patternset"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar dest="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri50.sar"/>
+ <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/sunri from jboss501 -->
+ <macrodef name="macro-undeploy-sunri501">
+ <sequential>
+ <delete>
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss501.home}/client">
+ <patternset refid="client.stack.patternset"/>
+ <patternset refid="client.patternset"/>
+ </fileset>
+
+ <!-- BOOTSTRAP JARS -->
+ <fileset dir="${jboss501.home}/lib">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss501.home}/server/${jboss.server.instance}/lib">
+ <patternset refid="serverlib.patternset"/>
+ </fileset>
+ </delete>
+
+ <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+</project>
Modified: stack/metro/trunk/ant.properties.example
===================================================================
--- stack/metro/trunk/ant.properties.example 2008-02-14 12:45:30 UTC (rev 5671)
+++ stack/metro/trunk/ant.properties.example 2008-02-14 12:51:27 UTC (rev 5672)
@@ -4,11 +4,12 @@
# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
# Optional JBoss Home
-#jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA
#jboss423.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA
+#jboss500.home=/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4
+#jboss501.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1
-# The JBoss server under test. This can be [jboss422|jboss423|jboss500]
+# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501]
jbossws.integration.target=jboss422
# The JBoss settings
@@ -42,4 +43,4 @@
#
# Metro CVS access
#
-cvs.user=heiko_braun
\ No newline at end of file
+cvs.user=anonymous
\ No newline at end of file
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2008-02-14 12:45:30 UTC (rev 5671)
+++ stack/metro/trunk/build.xml 2008-02-14 12:51:27 UTC (rev 5672)
@@ -147,7 +147,7 @@
</zip>
</target>
- <target name="jars-jboss50" depends="jars-common" if="jboss500.home">
+ <target name="jars-jboss50" depends="jars-common">
<!-- Concat jbossws-beans.xml -->
<concat destfile="${sunri.output.lib.dir}/jbossws-sunri50/jbossws-beans.xml">
Modified: stack/metro/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 12:45:30 UTC (rev 5671)
+++ stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 12:51:27 UTC (rev 5672)
@@ -27,13 +27,6 @@
<property file="${basedir}/ant.properties"/>
<property file="${basedir}/version.properties"/>
- <property name="jboss500.lib" value="${jboss500.home}/lib"/>
- <property name="jboss500.client" value="${jboss500.home}/client"/>
- <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
- <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
- <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
- <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
-
<property name="jboss422.lib" value="${jboss422.home}/lib"/>
<property name="jboss422.client" value="${jboss422.home}/client"/>
<property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
@@ -46,15 +39,31 @@
<property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
<property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
+ <property name="jboss500.lib" value="${jboss500.home}/lib"/>
+ <property name="jboss500.client" value="${jboss500.home}/client"/>
+ <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
+ <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
+ <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
+
+ <property name="jboss501.lib" value="${jboss501.home}/lib"/>
+ <property name="jboss501.client" value="${jboss501.home}/client"/>
+ <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
+ <property name="jboss501.server.lib" value="${jboss501.server}/lib"/>
+ <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
+ <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
+
<property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
- <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
<property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss501.available.file" value="${jboss501.client}/jboss-ejb3-client.jar"/>
- <available property="jboss500.available" file="${jboss500.available.file}"/>
<available property="jboss422.available" file="${jboss422.available.file}"/>
<available property="jboss423.available" file="${jboss423.available.file}"/>
+ <available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss501.available" file="${jboss501.available.file}"/>
<condition property="jbossws.integration.jboss42" value="true">
<or>
@@ -64,7 +73,10 @@
</or>
</condition>
<condition property="jbossws.integration.jboss50" value="true">
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
+ </or>
</condition>
<!-- JDK Detection -->
@@ -74,10 +86,8 @@
<fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
<import file="${basedir}/build/build-deploy.xml"/>
- <import file="${basedir}/build/macros-deploy-cxf.xml"/>
+ <import file="${basedir}/build/macros-deploy-framework.xml"/>
<import file="${basedir}/build/macros-deploy-sunri.xml"/>
- <import file="${basedir}/build/macros-deploy-native.xml"/>
- <import file="${basedir}/build/macros-deploy-framework.xml"/>
<import file="${basedir}/tests/ant-import/build-testsuite.xml"/>
<!-- ================================================================== -->
Modified: stack/metro/trunk/src/main/distro/bin-dist-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-14 12:45:30 UTC (rev 5671)
+++ stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-14 12:51:27 UTC (rev 5672)
@@ -14,7 +14,7 @@
<project>
<!-- ================================================================== -->
- <!-- Deployment JBoss422 -->
+ <!-- Deployment JBoss-4.2.2 -->
<!-- ================================================================== -->
<!-- Deploy jbossws/sunri to jboss422 -->
@@ -27,16 +27,16 @@
</target>
<!-- Remove jbossws/sunri from jboss422 -->
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss422">
- <macro-undeploy-cxf422/>
+ <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/sunri from jboss422">
<macro-undeploy-sunri422/>
- <macro-undeploy-native422/>
- <macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
<macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
+ <target name="undeploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
+ </target>
<!-- ================================================================== -->
- <!-- Deployment JBoss423 -->
+ <!-- Deployment JBoss-4.2.3 -->
<!-- ================================================================== -->
<!-- Deploy jbossws/sunri to jboss423 -->
@@ -49,16 +49,16 @@
</target>
<!-- Remove jbossws/sunri from jboss423 -->
- <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/sunri from jboss423">
- <macro-undeploy-cxf423/>
+ <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws/sunri from jboss423">
<macro-undeploy-sunri423/>
- <macro-undeploy-native423/>
- <macro-undeploy-endorsed jbosshome="${jboss423.home}"/>
<macro-undeploy-framework jbosshome="${jboss423.home}"/>
</target>
+ <target name="undeploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-undeploy-endorsed jbosshome="${jboss423.home}"/>
+ </target>
<!-- ================================================================== -->
- <!-- Deployment JBoss500 -->
+ <!-- Deployment JBoss-5.0.0 -->
<!-- ================================================================== -->
<!-- Deploy jbossws/sunri to jboss500 -->
@@ -72,11 +72,27 @@
<!-- Remove jbossws/sunri from jboss500 -->
<target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss500">
- <macro-undeploy-cxf500/>
<macro-undeploy-sunri500/>
- <macro-undeploy-native500/>
- <macro-undeploy-endorsed jbosshome="${jboss500.home}"/>
<macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
-</project>
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss-5.0.1 -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/sunri to jboss501 -->
+ <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws/sunri to jboss501">
+ <macro-deploy-sunri501 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
+ <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss501.home}"/>
+ </target>
+ <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed jbosshome="${jboss501.home}" thirdpartylibs="${lib.dir}"/>
+ </target>
+
+ <!-- Remove jbossws/sunri from jboss501 -->
+ <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/sunri from jboss501">
+ <macro-undeploy-sunri501/>
+ <macro-undeploy-framework jbosshome="${jboss501.home}"/>
+ </target>
+
+</project>
\ No newline at end of file
Copied: stack/metro/trunk/src/main/etc/bin-dist-build.xml (from rev 5572, stack/metro/trunk/src/main/etc/bin-dist-build.xml)
===================================================================
--- stack/metro/trunk/src/main/etc/bin-dist-build.xml (rev 0)
+++ stack/metro/trunk/src/main/etc/bin-dist-build.xml 2008-02-14 12:51:27 UTC (rev 5672)
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="." name="JBossWS-SunRI">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="thirdparty.dir" value="${basedir}/lib"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+ <property name="tests.output.dir" value="${tests.dir}/output"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
+ <property file="${build.dir}/version.properties"/>
+
+ <property name="jboss422.lib" value="${jboss422.home}/lib"/>
+ <property name="jboss422.client" value="${jboss422.home}/client"/>
+ <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
+ <property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
+ <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
+
+ <property name="jboss423.lib" value="${jboss423.home}/lib"/>
+ <property name="jboss423.client" value="${jboss423.home}/client"/>
+ <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
+ <property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
+ <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
+
+ <property name="jboss500.lib" value="${jboss500.home}/lib"/>
+ <property name="jboss500.client" value="${jboss500.home}/client"/>
+ <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
+ <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
+ <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
+
+ <property name="jboss501.lib" value="${jboss501.home}/lib"/>
+ <property name="jboss501.client" value="${jboss501.home}/client"/>
+ <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
+ <property name="jboss501.server.lib" value="${jboss501.server}/lib"/>
+ <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
+ <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
+
+ <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
+
+ <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
+ <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss501.available.file" value="${jboss501.client}/jboss-ejb3-client.jar"/>
+
+ <available property="jboss422.available" file="${jboss422.available.file}"/>
+ <available property="jboss423.available" file="${jboss423.available.file}"/>
+ <available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss501.available" file="${jboss501.available.file}"/>
+
+ <import file="${basedir}/build/build-deploy.xml"/>
+ <import file="${basedir}/build/build-testsuite.xml"/>
+ <import file="${basedir}/build/macros-deploy-spi.xml"/>
+ <import file="${basedir}/build/macros-deploy-native.xml"/>
+ <import file="${basedir}/build/macros-deploy-sunri.xml"/>
+ <import file="${basedir}/build/macros-deploy-xfire.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss422.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss500.home}">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
+ </or>
+ </condition>
+
+ <!-- Define excludesfile -->
+ <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
+
+ </target>
+
+ <target name="tests-init" depends="prepare,tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <pathelement location="${lib.dir}/jbossws-spi.jar"/>
+ <pathelement location="${thirdparty.dir}/FastInfoset.jar"/>
+ <pathelement location="${thirdparty.dir}/http.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
+ <pathelement location="${thirdparty.dir}/jsr173_api.jar"/>
+ <pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jsr250-api.jar"/>
+ <pathelement location="${thirdparty.dir}/resolver.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
+ <pathelement location="${thirdparty.dir}/sjsxp.jar"/>
+ <pathelement location="${thirdparty.dir}/stax-ex.jar"/>
+ <pathelement location="${thirdparty.dir}/streambuffer.jar"/>
+ <pathelement location="${thirdparty.dir}/wstx.jar"/>
+ <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ <pathelement location="${lib.dir}/jbossws-sunri-client.jar"/>
+ </path>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources">
+ <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ </target>
+
+ <target name="main" depends="most" description="Executes the default target (most)."/>
+
+ <target name="most" depends="tests-main" description="Builds almost everything."/>
+
+</project>
Copied: stack/metro/trunk/src/main/etc/bin-dist-deploy.xml (from rev 5572, stack/metro/trunk/src/main/etc/bin-dist-deploy.xml)
===================================================================
--- stack/metro/trunk/src/main/etc/bin-dist-deploy.xml (rev 0)
+++ stack/metro/trunk/src/main/etc/bin-dist-deploy.xml 2008-02-14 12:51:27 UTC (rev 5672)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss-4.2.2 -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/sunri to jboss422 -->
+ <target name="deploy-jboss422" depends="undeploy-jboss422" description="Deploy jbossws/sunri to jboss422">
+ <macro-undeploy-native422/>
+ <macro-undeploy-xfire422/>
+ <macro-deploy-sunri422
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss422.home}"/>
+ </target>
+
+ <!-- Remove jbossws/sunri from jboss42 -->
+ <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss422">
+ <macro-undeploy-sunri422/>
+ <macro-undeploy-spi jbosshome="${jboss422.home}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss-5.0.0 -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/sunri to jboss500 -->
+ <target name="deploy-jboss500" depends="undeploy-jboss500" description="Deploy jbossws/sunri to jboss500">
+ <macro-undeploy-native500/>
+ <macro-undeploy-xfire500/>
+ <macro-deploy-sunri500
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss500.home}"/>
+ </target>
+
+ <!-- Remove jbossws/sunri from jboss500 -->
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss500">
+ <macro-undeploy-sunri500/>
+ <macro-undeploy-spi jbosshome="${jboss500.home}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss-5.0.1 -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/sunri to jboss501 -->
+ <target name="deploy-jboss501" depends="undeploy-jboss501" description="Deploy jbossws/sunri to jboss501">
+ <macro-undeploy-native501/>
+ <macro-undeploy-xfire501/>
+ <macro-deploy-sunri501
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss501.home}"/>
+ </target>
+
+ <!-- Remove jbossws/sunri from jboss501 -->
+ <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/sunri from jboss501">
+ <macro-undeploy-sunri501/>
+ <macro-undeploy-spi jbosshome="${jboss501.home}"/>
+ </target>
+
+</project>
Modified: stack/metro/trunk/version.properties
===================================================================
--- stack/metro/trunk/version.properties 2008-02-14 12:45:30 UTC (rev 5671)
+++ stack/metro/trunk/version.properties 2008-02-14 12:51:27 UTC (rev 5672)
@@ -16,7 +16,6 @@
# Thirdparty library versions
jbossws-spi=1.0.1.GA
jbossws-common=1.0.3.GA
-jbossws-macros=1.0.0.GA
jbossws-framework=3.0.0.GA
jbossws-jboss42=4.2.1.GA
16 years, 11 months
JBossWS SVN: r5671 - in stack/native/trunk: ant-import and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-14 07:45:30 -0500 (Thu, 14 Feb 2008)
New Revision: 5671
Removed:
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/sourcecomp/XMLCompareTestCase.java
Modified:
stack/native/trunk/ant-import-tests/build-testsuite.xml
stack/native/trunk/ant-import/build-thirdparty.xml
stack/native/trunk/version.properties
Log:
remove obsolete and useless test
Modified: stack/native/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/trunk/ant-import/build-thirdparty.xml 2008-02-14 12:16:41 UTC (rev 5670)
+++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-02-14 12:45:30 UTC (rev 5671)
@@ -117,7 +117,6 @@
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/>
Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-testsuite.xml 2008-02-14 12:16:41 UTC (rev 5670)
+++ stack/native/trunk/ant-import-tests/build-testsuite.xml 2008-02-14 12:45:30 UTC (rev 5671)
@@ -46,7 +46,6 @@
<pathelement location="${core.dir}/thirdparty/stax-api.jar"/>
<pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
<pathelement location="${core.dir}/thirdparty/wstx.jar"/>
- <pathelement location="${core.dir}/thirdparty/xmlunit.jar"/>
<pathelement location="${core.dir}/thirdparty/jboss-jaxb-intros.jar"/>
</path>
@@ -63,10 +62,6 @@
<pathelement location="${core.dir}/thirdparty/jaxen.jar"/>
<pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
<pathelement location="${core.dir}/thirdparty/jboss-logging-log4j.jar"/>
- <!--
- <pathelement location="${core.dir}/thirdparty/log4j.jar"/>
- <pathelement location="${tests.etc.dir}"/>
- -->
</path>
</target>
Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/sourcecomp/XMLCompareTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/sourcecomp/XMLCompareTestCase.java 2008-02-14 12:16:41 UTC (rev 5670)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/sourcecomp/XMLCompareTestCase.java 2008-02-14 12:45:30 UTC (rev 5671)
@@ -1,69 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.tools.sourcecomp;
-
-import org.custommonkey.xmlunit.XMLAssert;
-import org.custommonkey.xmlunit.XMLUnit;
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- * Test case that uses XMLUnit to compare two xml files
- * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
- * @since Apr 6, 2005
- */
-
-public class XMLCompareTestCase extends JBossWSTest
-{
- public void testXMLEquivalence() throws Exception
- {
- String str = constructTestString(true);
- String str1 = constructTestString(false);
- XMLUnit.setIgnoreWhitespace(true);
- XMLAssert.assertXMLEqual(str, str);
- XMLAssert.assertXMLNotEqual(str, str1);
- }
-
- private String constructTestString(boolean addDummy)
- {
- StringBuffer buf = new StringBuffer();
- buf.append("<schema targetNamespace='http://org.jboss.ws/types'");
- buf.append(" xmlns='http://www.w3.org/2001/XMLSchema' ");
- buf.append(" xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' ");
- buf.append(" xmlns:xsd='http://www.w3.org/2001/XMLSchema' ");
- buf.append(" xmlns:tns='http://org.jboss.ws/types'>");
- buf.append("<complexType name='Base'>");
- buf.append(" <sequence>");
- buf.append(" <element name='a' type='xsd:int'/>");
- if (addDummy)
- buf.append(" <element name='b' type='xsd:int'/>");
- buf.append(" </sequence>");
- buf.append(" </complexType>");
- buf.append(" <complexType name='SomeException'>");
- buf.append(" <sequence>");
- buf.append(" <element name='name' type='xsd:string' nillable='true'/>");
- buf.append(" </sequence>");
- buf.append(" </complexType>");
- buf.append(" </schema>");
-
- return buf.toString();
- }
-}
\ No newline at end of file
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2008-02-14 12:16:41 UTC (rev 5670)
+++ stack/native/trunk/version.properties 2008-02-14 12:45:30 UTC (rev 5671)
@@ -47,11 +47,9 @@
apache-collections=3.1
apache-log4j=1.2.8
apache-logging=1.1.0.jboss
-apache-tomcat=5.5.20
apache-xalan=j_2.7.0
apache-xerces=2.9.0
dom4j=1.6.1
-eclipse-compiler=3.2.2
gnu-getopt=1.0.10
hibernate=3.2.1.GA
javassist=3.6.0.GA
@@ -72,4 +70,3 @@
sun-jaf=1.1
sun-javamail=1.4
sun-servlet=2.4
-xmlunit=1.0
16 years, 11 months
JBossWS SVN: r5670 - in stack/native/trunk: ant-import and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-14 07:16:41 -0500 (Thu, 14 Feb 2008)
New Revision: 5670
Added:
stack/native/trunk/ant-import/macros-deploy-framework.xml
stack/native/trunk/ant-import/macros-deploy-native.xml
Modified:
stack/native/trunk/ant-import/
stack/native/trunk/ant-import/build-bin-dist.xml
stack/native/trunk/ant-import/build-deploy.xml
stack/native/trunk/ant-import/build-thirdparty.xml
stack/native/trunk/src/main/distro/bin-dist-build.xml
stack/native/trunk/src/main/distro/bin-dist-deploy.xml
stack/native/trunk/version.properties
Log:
Rollback: [JBWS-1982] Simplify deploy/undeploy cycles for different stacks
Property changes on: stack/native/trunk/ant-import
___________________________________________________________________
Name: svn:ignore
- macros-deploy-cxf.xml
macros-deploy-framework.xml
macros-deploy-native.xml
macros-deploy-sunri.xml
Modified: stack/native/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-14 11:58:21 UTC (rev 5669)
+++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-14 12:16:41 UTC (rev 5670)
@@ -51,10 +51,8 @@
<!-- build -->
<copy todir="${bindist.build.dir}">
<fileset dir="${core.dir}/ant-import">
- <include name="macros-deploy-cxf.xml"/>
- <include name="macros-deploy-sunri.xml"/>
- <include name="macros-deploy-native.xml"/>
<include name="macros-deploy-framework.xml"/>
+ <include name="macros-deploy-native.xml"/>
</fileset>
<fileset dir="${core.distro.dir}">
<include name="user-project-build.xml"/>
Modified: stack/native/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml 2008-02-14 11:58:21 UTC (rev 5669)
+++ stack/native/trunk/ant-import/build-deploy.xml 2008-02-14 12:16:41 UTC (rev 5670)
@@ -13,10 +13,8 @@
<project>
- <import file="${core.dir}/ant-import/macros-deploy-framework.xml" optional="true"/>
- <import file="${core.dir}/ant-import/macros-deploy-cxf.xml" optional="true"/>
- <import file="${core.dir}/ant-import/macros-deploy-sunri.xml" optional="true"/>
- <import file="${core.dir}/ant-import/macros-deploy-native.xml" optional="true"/>
+ <import file="${core.dir}/ant-import/macros-deploy-framework.xml"/>
+ <import file="${core.dir}/ant-import/macros-deploy-native.xml"/>
<!-- ================================================================== -->
<!-- Deployment JBoss421 -->
@@ -33,16 +31,14 @@
</target>
<!-- Remove jbossws from jboss421 -->
- <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws from jboss421">
+ <target name="undeploy-jboss421" depends="prepare,undeploy-jboss421-endorsed" description="Remove jbossws from jboss421">
<macro-undeploy-native421/>
- <macro-undeploy-endorsed jbosshome="${jboss421.home}"/>
<macro-undeploy-framework jbosshome="${jboss421.home}"/>
</target>
+ <target name="undeploy-jboss421-endorsed" depends="prepare">
+ <macro-undeploy-endorsed jbosshome="${jboss421.home}"/>
+ </target>
- <!-- ================================================================== -->
- <!-- Deployment JBoss422 -->
- <!-- ================================================================== -->
-
<!-- Deploy jbossws to jboss422 -->
<target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws to jboss422">
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
@@ -55,19 +51,15 @@
</target>
<!-- Remove jbossws from jboss422 -->
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422">
+ <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws from jboss422">
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <macro-undeploy-cxf422/>
- <macro-undeploy-sunri422/>
<macro-undeploy-native422/>
<macro-undeploy-framework jbosshome="${jboss422.home}"/>
+ </target>
+ <target name="undeploy-jboss422-endorsed" depends="prepare">
<macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
</target>
- <!-- ================================================================== -->
- <!-- Deployment JBoss423 -->
- <!-- ================================================================== -->
-
<!-- Deploy jbossws to jboss423 -->
<target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws to jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
@@ -80,19 +72,15 @@
</target>
<!-- Remove jbossws from jboss423 -->
- <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423">
+ <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws from jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-undeploy-cxf423/>
- <macro-undeploy-sunri423/>
<macro-undeploy-native423/>
- <macro-undeploy-endorsed jbosshome="${jboss423.home}"/>
<macro-undeploy-framework jbosshome="${jboss423.home}"/>
</target>
+ <target name="undeploy-jboss423-endorsed" depends="prepare">
+ <macro-undeploy-endorsed jbosshome="${jboss423.home}"/>
+ </target>
- <!-- ================================================================== -->
- <!-- Deployment JBoss500 -->
- <!-- ================================================================== -->
-
<!-- Deploy jbossws to jboss500 -->
<target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws to jboss500">
<macro-deploy-native500 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
@@ -104,14 +92,15 @@
</target>
<!-- Remove jbossws from jboss500 -->
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500">
- <macro-undeploy-cxf500/>
- <macro-undeploy-sunri500/>
+ <target name="undeploy-jboss500" depends="prepare,undeploy-jboss500-endorsed" description="Remove jbossws from jboss500">
<macro-undeploy-native500/>
- <macro-undeploy-endorsed jbosshome="${jboss500.home}"/>
<macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
+ <target name="undeploy-jboss500-endorsed" depends="prepare">
+ <macro-undeploy-endorsed jbosshome="${jboss500.home}"/>
+ </target>
+
<!-- ================================================================== -->
<!-- Deployment JBoss501 -->
<!-- ================================================================== -->
@@ -128,11 +117,13 @@
<!-- Remove jbossws from jboss501 -->
<target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">
- <macro-undeploy-cxf501/>
- <macro-undeploy-sunri501/>
<macro-undeploy-native501/>
<macro-undeploy-endorsed jbosshome="${jboss501.home}"/>
<macro-undeploy-framework jbosshome="${jboss501.home}"/>
</target>
+ <target name="undeploy-jboss501-endorsed" depends="prepare">
+ <macro-undeploy-endorsed jbosshome="${jboss501.home}"/>
+ </target>
+
</project>
Modified: stack/native/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/trunk/ant-import/build-thirdparty.xml 2008-02-14 11:58:21 UTC (rev 5669)
+++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-02-14 12:16:41 UTC (rev 5670)
@@ -51,7 +51,6 @@
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.zip" dest="${thirdparty.dir}/jbossws-framework-src.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-macros/${jbossws-macros}/lib/jbossws-macros-src.zip" dest="${thirdparty.dir}/jbossws-macros-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/>
@@ -124,7 +123,7 @@
<mkdir dir="${thirdparty.dir}/jbpm-bpel"/>
<unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/>
- <unzip dest="${core.dir}/ant-import" src="${thirdparty.dir}/jbossws-macros-src.zip"/>
+
<checksum file="${core.dir}/version.properties" fileext=".md5"/>
</target>
@@ -135,8 +134,9 @@
<!-- A stack MUST NOT have a compile time dependency on jbossws-framework.jar -->
<pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
<pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
- <pathelement location="${thirdparty.dir}/ant.jar"/>
- <pathelement location="${thirdparty.dir}/activation.jar"/>
+
+ <pathelement location="${thirdparty.dir}/ant.jar"/>
+ <pathelement location="${thirdparty.dir}/activation.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
<pathelement location="${thirdparty.dir}/getopt.jar"/>
<pathelement location="${thirdparty.dir}/javassist.jar"/>
Copied: stack/native/trunk/ant-import/macros-deploy-framework.xml (from rev 5558, stack/native/trunk/ant-import/macros-deploy-framework.xml)
===================================================================
--- stack/native/trunk/ant-import/macros-deploy-framework.xml (rev 0)
+++ stack/native/trunk/ant-import/macros-deploy-framework.xml 2008-02-14 12:16:41 UTC (rev 5670)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: macros-deploy-spi.xml 3620 2007-06-18 20:39:56Z heiko.braun(a)jboss.com $ -->
+
+<project>
+
+ <macrodef name="macro-deploy-framework">
+ <attribute name="thirdpartylibs"/>
+ <attribute name="jbosshome"/>
+ <sequential>
+
+ <!-- BIN SCRIPTS -->
+ <unzip dest="@{jbosshome}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/>
+ <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- CLIENT JARS-->
+ <copy todir="@{jbosshome}/client">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS-->
+ <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-framework">
+ <attribute name="jbosshome"/>
+ <sequential>
+ <delete>
+ <!-- BIN SCRIPTS -->
+ <fileset dir="@{jbosshome}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS-->
+ <fileset dir="@{jbosshome}/client">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS-->
+ <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </delete>
+ </sequential>
+ </macrodef>
+
+</project>
\ No newline at end of file
Copied: stack/native/trunk/ant-import/macros-deploy-native.xml (from rev 5558, stack/native/trunk/ant-import/macros-deploy-native.xml)
===================================================================
--- stack/native/trunk/ant-import/macros-deploy-native.xml (rev 0)
+++ stack/native/trunk/ant-import/macros-deploy-native.xml 2008-02-14 12:16:41 UTC (rev 5670)
@@ -0,0 +1,573 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: macros-deploy-native.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Endorsed -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 -->
+ <macrodef name="macro-deploy-endorsed">
+ <attribute name="jbosshome"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <copy todir="@{jbosshome}/lib/endorsed" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ </fileset>
+ <fileset dir="@{stacklibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- Undeploy API jars from lib/endorsed -->
+ <macrodef name="macro-undeploy-endorsed">
+ <attribute name="jbosshome"/>
+ <sequential>
+ <delete>
+ <fileset dir="@{jbosshome}/lib/endorsed">
+ <include name="jaxb-api.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss-4.2.1 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-native421">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
+
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss421.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss421.home}/client" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jbossws-jboss421.jar"/>
+ <include name="jboss-xml-binding.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS -->
+ <copy todir="${jboss421.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jboss-xml-binding.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss421.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-jboss421.jar"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
+ <mkdir dir="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-native421">
+ <sequential>
+ <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
+ <delete>
+
+ <!-- BIN SCRIPTS -->
+ <fileset dir="${jboss421.home}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ <include name="wsrunclient.*"/>
+ <include name="wstools.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss421.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jbossws-jboss421.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss421.home}/lib/endorsed">
+ <include name="jaxb-api.jar"/>
+ </fileset>
+ <fileset dir="${jboss421.home}/lib">
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ <fileset dir="${jboss421.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-jboss421.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete dir="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss-4.2.2 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-native422">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss422.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss422.home}/client" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS -->
+ <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
+ <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-native422">
+ <sequential>
+
+ <delete>
+
+ <!-- BIN SCRIPTS -->
+ <fileset dir="${jboss422.home}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ <include name="wsrunclient.*"/>
+ <include name="wstools.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss422.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss422.home}/lib/endorsed">
+ <include name="jaxb-api.jar"/>
+ </fileset>
+ <fileset dir="${jboss422.home}/lib">
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ <fileset dir="${jboss422.home}/server/${jboss.server.instance}/lib">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss-4.2.3 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-native423">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss423.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss423.home}/client" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS -->
+ <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
+ <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-native423">
+ <sequential>
+
+ <delete>
+
+ <!-- BIN SCRIPTS -->
+ <fileset dir="${jboss423.home}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ <include name="wsrunclient.*"/>
+ <include name="wstools.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss423.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss423.home}/lib/endorsed">
+ <include name="jaxb-api.jar"/>
+ </fileset>
+ <fileset dir="${jboss423.home}/lib">
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ <fileset dir="${jboss423.home}/server/${jboss.server.instance}/lib">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss-5.0.0 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-native500">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss500.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss500.home}/client" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="policy.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss500.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS -->
+ <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
+ <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-native500">
+ <sequential>
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+
+ <delete>
+ <!-- BIN SCRIPTS -->
+ <fileset dir="${jboss500.home}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ <include name="wsrunclient.*"/>
+ <include name="wstools.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss500.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+
+ <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss-5.0.1 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-native501">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss501.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss501.home}/client" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="policy.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss501.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS -->
+ <copy todir="${jboss501.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
+ <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-native501">
+ <sequential>
+ <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+
+ <delete>
+ <!-- BIN SCRIPTS -->
+ <fileset dir="${jboss501.home}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ <include name="wsrunclient.*"/>
+ <include name="wstools.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss501.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss501.home}/server/${jboss.server.instance}/lib">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+
+ <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+</project>
Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 11:58:21 UTC (rev 5669)
+++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 12:16:41 UTC (rev 5670)
@@ -96,10 +96,8 @@
<import file="${basedir}/build/build-deploy.xml"/>
<import file="${basedir}/build/build-project-gen.xml"/>
- <import file="${basedir}/build/macros-deploy-cxf.xml"/>
- <import file="${basedir}/build/macros-deploy-sunri.xml"/>
- <import file="${basedir}/build/macros-deploy-native.xml"/>
<import file="${basedir}/build/macros-deploy-framework.xml"/>
+ <import file="${basedir}/build/macros-deploy-native.xml"/>
<import file="${basedir}/tests/ant-import/build-testsuite.xml"/>
<!-- ================================================================== -->
Modified: stack/native/trunk/src/main/distro/bin-dist-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-14 11:58:21 UTC (rev 5669)
+++ stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-14 12:16:41 UTC (rev 5670)
@@ -26,16 +26,14 @@
<macro-deploy-endorsed jbosshome="${jboss421.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
</target>
- <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws/native from jboss421">
+ <target name="undeploy-jboss421" depends="prepare,undeploy-jboss421-endorsed" description="Remove jbossws/native from jboss421">
<macro-undeploy-native421/>
<macro-undeploy-framework jbosshome="${jboss421.home}"/>
+ </target>
+ <target name="undeploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6">
<macro-undeploy-endorsed jbosshome="${jboss421.home}"/>
</target>
- <!-- ================================================================== -->
- <!-- Deployment JBoss422 -->
- <!-- ================================================================== -->
-
<!-- Deploy jbossws/native to jboss422 -->
<target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/native to jboss422">
<macro-deploy-native422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
@@ -45,18 +43,14 @@
<macro-deploy-endorsed jbosshome="${jboss422.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
</target>
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422">
- <macro-undeploy-cxf422/>
- <macro-undeploy-sunri422/>
+ <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/native from jboss422">
<macro-undeploy-native422/>
- <macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
<macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
+ <target name="undeploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
+ </target>
- <!-- ================================================================== -->
- <!-- Deployment JBoss423 -->
- <!-- ================================================================== -->
-
<!-- Deploy jbossws/native to jboss423 -->
<target name="deploy-jboss423" depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws/native to jboss423">
<macro-deploy-native423 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
@@ -66,19 +60,15 @@
<macro-deploy-endorsed jbosshome="${jboss423.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
</target>
- <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423">
- <macro-undeploy-cxf423/>
- <macro-undeploy-sunri423/>
+ <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws/native from jboss423">
<macro-undeploy-native423/>
- <macro-undeploy-endorsed jbosshome="${jboss423.home}"/>
<macro-undeploy-framework jbosshome="${jboss423.home}"/>
</target>
+ <target name="undeploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-undeploy-endorsed jbosshome="${jboss423.home}"/>
+ </target>
- <!-- ================================================================== -->
- <!-- Deployment JBoss500 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/native to jboss500 -->
+ <!-- Deploy jbossws/native to jboss50 -->
<target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/native to jboss500">
<macro-deploy-native500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
<macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss500.home}"/>
@@ -87,11 +77,8 @@
<macro-deploy-endorsed jbosshome="${jboss500.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
</target>
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500">
- <macro-undeploy-cxf500/>
- <macro-undeploy-sunri500/>
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/native from jboss500">
<macro-undeploy-native500/>
- <macro-undeploy-endorsed jbosshome="${jboss500.home}"/>
<macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2008-02-14 11:58:21 UTC (rev 5669)
+++ stack/native/trunk/version.properties 2008-02-14 12:16:41 UTC (rev 5670)
@@ -27,7 +27,6 @@
jbossws-spi=snapshot
jbossws-common=snapshot
jbossws-framework=snapshot
-jbossws-macros=1.0.0.GA
jbossws-jboss40=4.0.5.SP2
jbossws-jboss42=4.2.1.GA
16 years, 11 months
JBossWS SVN: r5669 - framework/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-14 06:58:21 -0500 (Thu, 14 Feb 2008)
New Revision: 5669
Removed:
framework/trunk/macros/
Log:
Rollback: [JBWS-1982] Simplify deploy/undeploy cycles for different stacks
16 years, 11 months
JBossWS SVN: r5668 - in stack/native/trunk: ant-import and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-14 06:47:59 -0500 (Thu, 14 Feb 2008)
New Revision: 5668
Modified:
stack/native/trunk/ant-import/build-deploy.xml
stack/native/trunk/ant-import/build-setup.xml
stack/native/trunk/ant.properties.example
stack/native/trunk/src/main/distro/bin-dist-build.xml
stack/native/trunk/src/main/distro/bin-dist-deploy.xml
Log:
More AS-5.0.1
Modified: stack/native/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml 2008-02-14 11:46:13 UTC (rev 5667)
+++ stack/native/trunk/ant-import/build-deploy.xml 2008-02-14 11:47:59 UTC (rev 5668)
@@ -19,29 +19,6 @@
<import file="${core.dir}/ant-import/macros-deploy-native.xml" optional="true"/>
<!-- ================================================================== -->
- <!-- Deployment JBoss405 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws to jboss405 -->
- <target name="deploy-jboss405" depends="deploy-jboss405-ejb3,deploy-jboss405-no-ejb3" description="Deploy jbossws to jboss405"/>
-
- <target name="deploy-jboss405-ejb3" depends="jars-jboss40,undeploy-jboss405">
- <macro-deploy-native405 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
- <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss405.home}"/>
- </target>
-
- <target name="deploy-jboss405-no-ejb3" depends="deploy-jboss405-ejb3" unless="jboss405.ejb3.available"
- description="Deploy jbossws to jboss405 without EJB3 support">
- <macro-deploy-native405-no-ejb3/>
- </target>
-
- <!-- Remove jbossws from jboss405 -->
- <target name="undeploy-jboss405" depends="prepare" description="Remove jbossws from jboss405">
- <macro-undeploy-native405/>
- <macro-undeploy-framework jbosshome="${jboss405.home}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Deployment JBoss421 -->
<!-- ================================================================== -->
@@ -135,4 +112,27 @@
<macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss501 -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws to jboss501 -->
+ <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws to jboss501">
+ <macro-deploy-native501 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
+ <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss501.home}"/>
+ </target>
+
+ <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed jbosshome="${jboss501.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
+ </target>
+
+ <!-- Remove jbossws from jboss501 -->
+ <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">
+ <macro-undeploy-cxf501/>
+ <macro-undeploy-sunri501/>
+ <macro-undeploy-native501/>
+ <macro-undeploy-endorsed jbosshome="${jboss501.home}"/>
+ <macro-undeploy-framework jbosshome="${jboss501.home}"/>
+ </target>
+
</project>
Modified: stack/native/trunk/ant-import/build-setup.xml
===================================================================
--- stack/native/trunk/ant-import/build-setup.xml 2008-02-14 11:46:13 UTC (rev 5667)
+++ stack/native/trunk/ant-import/build-setup.xml 2008-02-14 11:47:59 UTC (rev 5668)
@@ -24,12 +24,6 @@
<property file="${basedir}/ant.properties"/>
<property file="${basedir}/version.properties"/>
- <property name="jboss405.lib" value="${jboss405.home}/lib"/>
- <property name="jboss405.client" value="${jboss405.home}/client"/>
- <property name="jboss405.server" value="${jboss405.home}/server/${jboss.server.instance}"/>
- <property name="jboss405.server.lib" value="${jboss405.server}/lib"/>
- <property name="jboss405.server.deploy" value="${jboss405.server}/deploy"/>
-
<property name="jboss421.lib" value="${jboss421.home}/lib"/>
<property name="jboss421.client" value="${jboss421.home}/client"/>
<property name="jboss421.server" value="${jboss421.home}/server/${jboss.server.instance}"/>
@@ -55,27 +49,27 @@
<property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
<property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
+ <property name="jboss501.lib" value="${jboss501.home}/lib"/>
+ <property name="jboss501.client" value="${jboss501.home}/client"/>
+ <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
+ <property name="jboss501.server.lib" value="${jboss501.server}/lib"/>
+ <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
+ <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
+
<property name="jboss.server.instance.${jboss.server.instance}" value="true"/>
- <property name="jboss405.available.file" value="${jboss405.client}/jboss-client.jar"/>
<property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/>
<property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
<property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss501.available.file" value="${jboss501.client}/jboss-ejb3-client.jar"/>
- <available property="jboss405.available" file="${jboss405.available.file}"/>
- <available property="jboss405.ejb3.available" file="${jboss405.client}/jboss-ejb3-client.jar"/>
<available property="jboss421.available" file="${jboss421.available.file}"/>
<available property="jboss422.available" file="${jboss422.available.file}"/>
<available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss501.available" file="${jboss501.available.file}"/>
- <condition property="jbossws.integration.jboss40" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss405"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss405.no.ejb3"/>
- </or>
- </condition>
<condition property="jbossws.integration.jboss42" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
@@ -84,7 +78,10 @@
</or>
</condition>
<condition property="jbossws.integration.jboss50" value="true">
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
+ </or>
</condition>
<available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
Modified: stack/native/trunk/ant.properties.example
===================================================================
--- stack/native/trunk/ant.properties.example 2008-02-14 11:46:13 UTC (rev 5667)
+++ stack/native/trunk/ant.properties.example 2008-02-14 11:47:59 UTC (rev 5668)
@@ -4,14 +4,13 @@
# $Id$
# Optional JBoss Home
-#jboss405.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
-#jboss405.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA
#jboss421.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA
#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA
#jboss423.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA
-#jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1
+#jboss500.home=/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4
+#jboss501.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1
-# The JBoss server under test. This can be [jboss405|jboss405.no.ejb3|jboss421|jboss422|jboss423|jboss500]
+# The JBoss server under test. This can be [jboss421|jboss422|jboss423|jboss500|jboss501]
jbossws.integration.target=jboss500
# The JBoss server instance
Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 11:46:13 UTC (rev 5667)
+++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 11:47:59 UTC (rev 5668)
@@ -28,12 +28,6 @@
<property file="${basedir}/ant.properties"/>
<property file="${basedir}/version.properties"/>
- <property name="jboss405.lib" value="${jboss405.home}/lib"/>
- <property name="jboss405.client" value="${jboss405.home}/client"/>
- <property name="jboss405.server" value="${jboss405.home}/server/${jboss.server.instance}"/>
- <property name="jboss405.server.lib" value="${jboss405.server}/lib"/>
- <property name="jboss405.server.deploy" value="${jboss405.server}/deploy"/>
-
<property name="jboss421.lib" value="${jboss421.home}/lib"/>
<property name="jboss421.client" value="${jboss421.home}/client"/>
<property name="jboss421.server" value="${jboss421.home}/server/${jboss.server.instance}"/>
@@ -59,27 +53,27 @@
<property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
<property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
+ <property name="jboss501.lib" value="${jboss501.home}/lib"/>
+ <property name="jboss501.client" value="${jboss501.home}/client"/>
+ <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
+ <property name="jboss501.server.lib" value="${jboss501.server}/lib"/>
+ <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
+ <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
+
<property name="jboss.server.instance.${jboss.server.instance}" value="true"/>
- <property name="jboss405.available.file" value="${jboss405.client}/jboss-client.jar"/>
<property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/>
<property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
<property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss501.available.file" value="${jboss501.client}/jboss-ejb3-client.jar"/>
- <available property="jboss405.available" file="${jboss405.available.file}"/>
- <available property="jboss405.ejb3.available" file="${jboss405.client}/jboss-ejb3-client.jar"/>
<available property="jboss421.available" file="${jboss421.available.file}"/>
<available property="jboss422.available" file="${jboss422.available.file}"/>
<available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss501.available" file="${jboss501.available.file}"/>
- <condition property="jbossws.integration.jboss40" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss405"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss405.no.ejb3"/>
- </or>
- </condition>
<condition property="jbossws.integration.jboss42" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
@@ -88,7 +82,10 @@
</or>
</condition>
<condition property="jbossws.integration.jboss50" value="true">
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
+ </or>
</condition>
<!-- JDK Detection -->
Modified: stack/native/trunk/src/main/distro/bin-dist-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-14 11:46:13 UTC (rev 5667)
+++ stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-14 11:47:59 UTC (rev 5668)
@@ -14,31 +14,6 @@
<project>
<!-- ================================================================== -->
- <!-- Deployment JBoss405 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/native to jboss405 -->
- <target name="deploy-jboss405" depends="deploy-jboss405-ejb3,deploy-jboss405-no-ejb3" description="Deploy jbossws/native to jboss405"/>
-
- <target name="deploy-jboss405-ejb3" depends="undeploy-jboss405">
- <macro-deploy-native405 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss405.home}"/>
- </target>
-
- <target name="deploy-jboss405-no-ejb3" depends="deploy-jboss405-ejb3" unless="jboss405.ejb3.available">
- <macro-deploy-native405-no-ejb3/>
- <echo>*********************************</echo>
- <echo>* JBossWS EJB3 support disabled *</echo>
- <echo>* All EJB3 tests will fail. *</echo>
- <echo>*********************************</echo>
- </target>
-
- <target name="undeploy-jboss405" depends="prepare" description="Remove jbossws/native from jboss405">
- <macro-undeploy-native405/>
- <macro-undeploy-framework jbosshome="${jboss405.home}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Deployment JBoss421 -->
<!-- ================================================================== -->
@@ -120,4 +95,25 @@
<macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss501 -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/native to jboss501 -->
+ <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws/native to jboss501">
+ <macro-deploy-native501 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
+ <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss501.home}"/>
+ </target>
+ <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed jbosshome="${jboss501.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
+ </target>
+
+ <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">
+ <macro-undeploy-cxf501/>
+ <macro-undeploy-sunri501/>
+ <macro-undeploy-native501/>
+ <macro-undeploy-endorsed jbosshome="${jboss501.home}"/>
+ <macro-undeploy-framework jbosshome="${jboss501.home}"/>
+ </target>
+
</project>
16 years, 11 months
JBossWS SVN: r5667 - in framework/trunk/hudson/hudson-home: jobs/AS-Tests-AS-4.2.1 and 46 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-14 06:46:13 -0500 (Thu, 14 Feb 2008)
New Revision: 5667
Modified:
framework/trunk/hudson/hudson-home/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Jaxr-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Jaxrpc-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Saaj-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Webservices-AS-4.2.3/config.xml
Log:
Rollback: [JBWS-1982] Simplify deploy/undeploy cycles for different stacks
Modified: framework/trunk/hudson/hudson-home/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -7,6 +7,8 @@
<h2>JBossWS-(a)version.id@ QA Environment</h2>
<table>
+ <tr><th align=left>TCK-14:</th><td>@hudson.tck14.url@</td></tr>
+ <tr><td colspan=2></td></tr>
<tr><th align=left>Framework:</th><td>@hudson.framework.url@</td></tr>
<tr><td colspan=2></td></tr>
<tr><th align=left>Stack-Native:</th><td>@hudson.native.url@</td></tr>
@@ -164,6 +166,7 @@
<tr align=center><th align=left>AS-4.2.3</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-5.0.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-5.0.1</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
+</table>
]]>
</description>
</view>
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -25,9 +25,7 @@
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-ant $ENVIRONMENT clean
-ant $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-ant $ENVIRONMENT deploy-jboss421
+ant $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss421
#
# start jbossas
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
# build and deploy
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-ant $ENVIRONMENT clean
-ant $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-ant $ENVIRONMENT deploy-jboss422
+ant $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422
#
# start jbossas
@@ -89,6 +103,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
# build and deploy
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-ant $ENVIRONMENT clean
-ant $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-ant $ENVIRONMENT deploy-jboss423
+ant $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
#
# start jbossas
@@ -89,6 +103,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
# build and deploy
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-ant $ENVIRONMENT clean
-ant $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-ant $ENVIRONMENT deploy-jboss500
+ant $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500
#
# start jbossas
@@ -89,6 +103,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,6 +10,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
# Build distro
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
@@ -79,6 +93,14 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.cxf.url@</remote>
<local>stack-cxf</local>
</hudson.scm.SubversionSCM-ModuleLocation>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,6 +10,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
# Build distro
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
@@ -79,6 +93,14 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.cxf.url@</remote>
<local>stack-cxf</local>
</hudson.scm.SubversionSCM-ModuleLocation>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,6 +10,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
@@ -23,13 +25,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
# Build distro
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
@@ -81,6 +95,14 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.cxf.url@</remote>
<local>stack-cxf</local>
</hudson.scm.SubversionSCM-ModuleLocation>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,6 +10,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss501
+
+#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss501
+
+#
# Build distro
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
@@ -79,6 +93,14 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.cxf.url@</remote>
<local>stack-cxf</local>
</hudson.scm.SubversionSCM-ModuleLocation>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,6 +10,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
# build and deploy
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss422
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422
#
# start jbossas
@@ -73,6 +87,14 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.cxf.url@</remote>
<local>stack-cxf</local>
</hudson.scm.SubversionSCM-ModuleLocation>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,6 +10,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
# build and deploy
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss423
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
#
# start jbossas
@@ -73,6 +87,14 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.cxf.url@</remote>
<local>stack-cxf</local>
</hudson.scm.SubversionSCM-ModuleLocation>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,6 +10,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
# build and deploy
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss500
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500
#
# start jbossas
@@ -73,6 +87,14 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.cxf.url@</remote>
<local>stack-cxf</local>
</hudson.scm.SubversionSCM-ModuleLocation>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,6 +10,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss501
+
+#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss501
+
+#
# build and deploy
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss501
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss501
#
# start jbossas
@@ -73,6 +87,14 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.cxf.url@</remote>
<local>stack-cxf</local>
</hudson.scm.SubversionSCM-ModuleLocation>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,12 +10,12 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
-JBOSS_INSTANCE=$JBOSS422_INSTANCE
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE"
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -23,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
# build and deploy
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss422
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422
#
# start jbossas
@@ -75,9 +87,17 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.metro.url@</remote>
<local>stack-metro</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,12 +10,12 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss500.home=$JBOSS500_INSTANCE -Djboss423.home=$JBOSS_INSTANCE"
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -23,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
# build and deploy
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss423
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
#
# start jbossas
@@ -75,9 +87,17 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.metro.url@</remote>
<local>stack-metro</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,7 +10,9 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
@@ -23,13 +25,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
# build and deploy
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss500
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500
#
# start jbossas
@@ -75,9 +89,17 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.metro.url@</remote>
<local>stack-metro</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
@@ -95,6 +117,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-metro-(a)version.id@ against AS-4.2.2</description>
+ <description>Build and test jbossws-metro-(a)version.id@ against AS-5.0.0</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,7 +10,9 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss501
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss501
+
+#
# build and deploy
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss501
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss501
#
# start jbossas
@@ -73,9 +87,17 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.metro.url@</remote>
<local>stack-metro</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
@@ -93,6 +115,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-metro-(a)version.id@ against AS-4.2.2</description>
+ <description>Build and test jbossws-metro-(a)version.id@ against AS-5.0.1</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,12 +10,12 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
-JBOSS_INSTANCE=$JBOSS422_INSTANCE
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE"
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -23,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
# Build distro
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
@@ -81,9 +93,17 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.metro.url@</remote>
<local>stack-metro</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,7 +10,9 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
# Build distro
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
@@ -79,9 +93,17 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.metro.url@</remote>
<local>stack-metro</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,7 +10,9 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
@@ -23,13 +25,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
# Build distro
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
@@ -81,9 +95,17 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.metro.url@</remote>
<local>stack-metro</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,7 +10,9 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss501
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss501
+
+#
# Build distro
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
@@ -79,9 +93,17 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.metro.url@</remote>
<local>stack-metro</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,7 +10,9 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
# build and deploy
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss422
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422
#
# start jbossas
@@ -73,9 +87,17 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.metro.url@</remote>
<local>stack-metro</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,7 +10,9 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
# build and deploy
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss423
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
#
# start jbossas
@@ -73,9 +87,17 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.metro.url@</remote>
<local>stack-metro</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,7 +10,9 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
# build and deploy
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss500
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500
#
# start jbossas
@@ -73,9 +87,17 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.metro.url@</remote>
<local>stack-metro</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -10,7 +10,9 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss501
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss501
+
+#
# build and deploy
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss501
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss501
#
# start jbossas
@@ -73,9 +87,17 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.metro.url@</remote>
<local>stack-metro</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -25,9 +25,7 @@
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss421
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss421
#
# start jbossas
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
# build and deploy
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss422
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422
#
# start jbossas
@@ -76,6 +90,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE"
@@ -31,13 +33,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
# build and deploy
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss422
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422
#
# start jbossas
@@ -86,6 +100,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
# build and deploy
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss423
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
#
# start jbossas
@@ -76,6 +90,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
@@ -31,13 +33,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
# build and deploy
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss423
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
#
# start jbossas
@@ -86,6 +100,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
# build and deploy
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss500
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500
#
# start jbossas
@@ -76,6 +90,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss501
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss501
+
+#
# build and deploy
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss501
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss501
#
# start jbossas
@@ -76,6 +90,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -25,9 +25,7 @@
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
# Build distro
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
@@ -82,6 +96,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE"
@@ -31,13 +33,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
# Build distro
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
@@ -92,6 +106,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
# Build distro
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
@@ -82,6 +96,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
@@ -31,13 +33,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
# Build distro
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
@@ -92,6 +106,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
# Build distro
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
@@ -82,6 +96,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss501
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss501
+
+#
# Build distro
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
@@ -82,6 +96,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.1/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.1/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -25,9 +25,7 @@
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss421
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss421
#
# start jbossas
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
# build and deploy
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss422
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422
#
# start jbossas
@@ -76,6 +90,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
# build and deploy
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss423
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
#
# start jbossas
@@ -76,6 +90,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
# build and deploy
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss500
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500
#
# start jbossas
@@ -76,6 +90,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -11,6 +11,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE"
@@ -21,13 +23,25 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss501
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss501
+
+#
# build and deploy
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss501
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss501
#
# start jbossas
@@ -76,6 +90,14 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Jaxr-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Jaxr-AS-4.2.3/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Jaxr-AS-4.2.3/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -77,9 +77,7 @@
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss423
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
#
# prepare TCK for use with jboss
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Jaxrpc-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Jaxrpc-AS-4.2.3/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Jaxrpc-AS-4.2.3/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -77,9 +77,7 @@
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss423
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
#
# prepare TCK for use with jboss
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Saaj-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Saaj-AS-4.2.3/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Saaj-AS-4.2.3/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -77,9 +77,7 @@
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss423
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
#
# prepare TCK for use with jboss
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Webservices-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Webservices-AS-4.2.3/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Webservices-AS-4.2.3/config.xml 2008-02-14 11:46:13 UTC (rev 5667)
@@ -77,9 +77,7 @@
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-./build.sh $ENVIRONMENT deploy-jboss423
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
#
# prepare TCK for use with jboss
16 years, 11 months
JBossWS SVN: r5666 - in framework/trunk/hudson/hudson-home/jobs: AS-Tests-AS-5.0.1 and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-14 05:56:10 -0500 (Thu, 14 Feb 2008)
New Revision: 5666
Added:
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml
Log:
adding missing job
Added: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml 2008-02-14 10:56:10 UTC (rev 5666)
@@ -0,0 +1,111 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=AS-Tests-AS-5.0.1
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build and deploy
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT clean
+ant $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
+ant $ENVIRONMENT deploy-jboss501
+
+#
+# start jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# build the testsuite
+#
+cd $JBOSS_INSTANCE/../../../testsuite
+./build.sh -Dnode0=$JBOSS_BINDADDR clean main
+
+#
+# execute tests
+#
+./build.sh -Dnode0=$JBOSS_BINDADDR tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# copy the test reports
+#
+rm -rf $WORKSPACE/test-reports
+mkdir $WORKSPACE/test-reports
+cp -r ./output/reports/*.xml $WORKSPACE/test-reports
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>test-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Run the AS-5.0.1 webservice testsuite agains jbossws-(a)version.id@</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 11 months
JBossWS SVN: r5665 - framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-14 05:46:48 -0500 (Thu, 14 Feb 2008)
New Revision: 5665
Modified:
framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
Log:
AS 4.0.5 isn't available
Modified: framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2008-02-14 10:31:23 UTC (rev 5664)
+++ framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2008-02-14 10:46:48 UTC (rev 5665)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-4.0.5, AS-4.2.1, AS-4.2.2, AS-4.2.3, AS-5.0.0, AS-5.0.1</childProjects>
+ <childProjects>AS-4.2.1, AS-4.2.2, AS-4.2.3, AS-5.0.0, AS-5.0.1</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
16 years, 11 months