Author: thomas.diesler(a)jboss.com Date: 2008-02-25 06:49:44 -0500 (Mon, 25 Feb 2008) New Revision: 5792 Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml stack/cxf/trunk/build.xml Log: [JBWS-1982] Simplify deploy/undeploy cycles for different stacks deploy/undeploy based on filelist Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-25 11:08:37 UTC (rev 5791) +++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-25 11:49:44 UTC (rev 5792) @@ -12,20 +12,23 @@ <!-- $Id$ --> <project> - + <!-- ================================================================== --> <!-- Deployment JBoss-4.2.2 --> <!-- ================================================================== --> <!-- Deploy jbossws/cxf to jboss422 --> <macrodef name="macro-deploy-cxf422"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> + <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"> + + <delete dir="${cxf.output.deploy.dir}"/> + + <!-- CLIENT JARS --> + <mkdir dir="${cxf.output.deploy.dir}/client"/> + <copy todir="${cxf.output.deploy.dir}/client" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> @@ -33,34 +36,44 @@ </fileset> </copy> - <!-- BOOTSTRAP JARS --> - <copy todir="${jboss422.home}/lib" overwrite="true"> + <!-- BOOTSTRAP JARS --> + <mkdir dir="${cxf.output.deploy.dir}/lib"/> + <copy todir="${cxf.output.deploy.dir}/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; + + <!--SERVER JARS --> + <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/> + <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src=&quot;(a){stacklibs}/jbossws-cxf42.sar&quot;/&gt; + <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + + <fileset id="jbossws.deploy.files" dir="${cxf.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> + <copy todir="${jboss422.home}" overwrite="true"> + <fileset refid="jbossws.deploy.files"/> + </copy> + + <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> + <echo file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> + <replace file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> + <copy todir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> + </sequential> </macrodef> - + <!-- Undeploy jbossws/cxf from jboss422 --> <macrodef name="macro-undeploy-cxf422"> <sequential> + + <loadfile property="jbossws.undeploy.files" srcfile="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> + <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> <delete> - <!-- CLIENT JARS --> - <fileset dir="${jboss422.home}/client"> - <include name="jbossws-spi.jar"/> - </fileset> + <fileset dir="${jboss422.home}" includes="${jbossws.undeploy.files}"/> </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> @@ -70,13 +83,16 @@ <!-- Deploy jbossws/cxf to jboss423 --> <macrodef name="macro-deploy-cxf423"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> + <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"> + + <delete dir="${cxf.output.deploy.dir}"/> + + <!-- CLIENT JARS --> + <mkdir dir="${cxf.output.deploy.dir}/client"/> + <copy todir="${cxf.output.deploy.dir}/client" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> @@ -84,34 +100,44 @@ </fileset> </copy> - <!-- BOOTSTRAP JARS --> - <copy todir="${jboss423.home}/lib" overwrite="true"> + <!-- BOOTSTRAP JARS --> + <mkdir dir="${cxf.output.deploy.dir}/lib"/> + <copy todir="${cxf.output.deploy.dir}/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; + + <!--SERVER JARS --> + <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/> + <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src=&quot;(a){stacklibs}/jbossws-cxf42.sar&quot;/&gt; + <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + + <fileset id="jbossws.deploy.files" dir="${cxf.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> + <copy todir="${jboss423.home}" overwrite="true"> + <fileset refid="jbossws.deploy.files"/> + </copy> + + <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> + <echo file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> + <replace file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> + <copy todir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> + </sequential> </macrodef> - + <!-- Undeploy jbossws/cxf from jboss423 --> <macrodef name="macro-undeploy-cxf423"> <sequential> + + <loadfile property="jbossws.undeploy.files" srcfile="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> + <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> <delete> - <!-- CLIENT JARS --> - <fileset dir="${jboss423.home}/client"> - <include name="jbossws-spi.jar"/> - </fileset> + <fileset dir="${jboss423.home}" includes="${jbossws.undeploy.files}"/> </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> @@ -121,13 +147,16 @@ <!-- Deploy jbossws/cxf to jboss500 --> <macrodef name="macro-deploy-cxf500"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> + <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"> + + <delete dir="${cxf.output.deploy.dir}"/> + + <!-- CLIENT JARS --> + <mkdir dir="${cxf.output.deploy.dir}/client"/> + <copy todir="${cxf.output.deploy.dir}/client" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> @@ -135,55 +164,52 @@ </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}"> + <!-- BOOTSTRAP JARS --> + <mkdir dir="${cxf.output.deploy.dir}/lib"/> + <copy todir="${cxf.output.deploy.dir}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + + <!--SERVER JARS --> + <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/lib"/> + <copy todir="${cxf.output.deploy.dir}/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> + </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; + <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/> + <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src=&quot;(a){stacklibs}/jbossws-cxf50.sar&quot;/&gt; + <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + + <fileset id="jbossws.deploy.files" dir="${cxf.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> + <copy todir="${jboss500.home}" overwrite="true"> + <fileset refid="jbossws.deploy.files"/> + </copy> + + <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> + <echo file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> + <replace file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> + <copy todir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> + </sequential> </macrodef> - + <!-- Undeploy jbossws/cxf from jboss500 --> <macrodef name="macro-undeploy-cxf500"> <sequential> + + <loadfile property="jbossws.undeploy.files" srcfile="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> + <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> <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> + <fileset dir="${jboss500.home}" includes="${jbossws.undeploy.files}"/> </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> @@ -193,13 +219,16 @@ <!-- Deploy jbossws/cxf to jboss501 --> <macrodef name="macro-deploy-cxf501"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> + <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"> + + <delete dir="${cxf.output.deploy.dir}"/> + + <!-- CLIENT JARS --> + <mkdir dir="${cxf.output.deploy.dir}/client"/> + <copy todir="${cxf.output.deploy.dir}/client" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> @@ -207,56 +236,53 @@ </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}"> + <!-- BOOTSTRAP JARS --> + <mkdir dir="${cxf.output.deploy.dir}/lib"/> + <copy todir="${cxf.output.deploy.dir}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + + <!--SERVER JARS --> + <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/lib"/> + <copy todir="${cxf.output.deploy.dir}/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> + </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; + <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/> + <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src=&quot;(a){stacklibs}/jbossws-cxf50.sar&quot;/&gt; + <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + + <fileset id="jbossws.deploy.files" dir="${cxf.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> + <copy todir="${jboss501.home}" overwrite="true"> + <fileset refid="jbossws.deploy.files"/> + </copy> + + <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> + <echo file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> + <replace file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> + <copy todir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> + </sequential> </macrodef> - + <!-- Undeploy jbossws/cxf from jboss501 --> <macrodef name="macro-undeploy-cxf501"> <sequential> + + <loadfile property="jbossws.undeploy.files" srcfile="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> + <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> <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> + <fileset dir="${jboss501.home}" includes="${jbossws.undeploy.files}"/> </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> +</project> \ No newline at end of file Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-02-25 11:08:37 UTC (rev 5791) +++ stack/cxf/trunk/build.xml 2008-02-25 11:49:44 UTC (rev 5792) @@ -35,6 +35,7 @@ <property name="cxf.output.dir" value="${cxf.dir}/output"/> <property name="cxf.output.apidocs.dir" value="${cxf.output.dir}/apidocs"/> <property name="cxf.output.classes.dir" value="${cxf.output.dir}/classes"/> + <property name="cxf.output.deploy.dir" value="${cxf.output.dir}/deploy"/> <property name="cxf.output.etc.dir" value="${cxf.output.dir}/etc"/> <property name="cxf.output.lib.dir" value="${cxf.output.dir}/lib"/>