[jbossws-commits] JBossWS SVN: r5674 - in stack/cxf/trunk: ant-import and 2 other directories.

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=&quot;(a){stacklibs}/jbossws-cxf42.sar&quot;/&gt; + <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </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=&quot;(a){stacklibs}/jbossws-cxf42.sar&quot;/&gt; + <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </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=&quot;(a){stacklibs}/jbossws-cxf50.sar&quot;/&gt; + <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </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=&quot;(a){stacklibs}/jbossws-cxf50.sar&quot;/&gt; + <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </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=&quot;(a){thirdpartylibs}/jbossws-framework-scripts.zip&quot;/&gt; + <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=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; + <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=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; + <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