[jbossws-commits] JBossWS SVN: r5566 - stack/cxf/trunk/ant-import.

Author: richard.opalka(a)jboss.com Date: 2008-02-05 14:12:33 -0500 (Tue, 05 Feb 2008) New Revision: 5566 Modified: stack/cxf/trunk/ant-import/build-deploy.xml stack/cxf/trunk/ant-import/macros-deploy-cxf.xml stack/cxf/trunk/ant-import/macros-deploy-framework.xml Log: [JBWS-1982] optimization Modified: stack/cxf/trunk/ant-import/build-deploy.xml =================================================================== --- stack/cxf/trunk/ant-import/build-deploy.xml 2008-02-05 12:58:25 UTC (rev 5565) +++ stack/cxf/trunk/ant-import/build-deploy.xml 2008-02-05 19:12:33 UTC (rev 5566) @@ -13,62 +13,64 @@ <project> - <import file="${int.cxf.dir}/ant-import/macros-deploy-framework.xml"/> + <import file="${int.cxf.dir}/ant-import/macros-deploy-framework.xml"/> <import file="${int.cxf.dir}/ant-import/macros-deploy-cxf.xml"/> - + <!-- ================================================================== --> - <!-- Deployment --> + <!-- Deployment JBoss422 --> <!-- ================================================================== --> - - <!-- 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}"/> - </target> - - <!-- Remove from jboss500 --> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss500"> - <macro-undeploy-cxf500/> - <macro-undeploy-framework jbosshome="${jboss500.home}"/> - </target> - - <!-- 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-framework jbosshome="${jboss422.home}"/> + <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> - <!-- Deploy to jboss423 --> + <!-- ================================================================== --> + <!-- Deployment 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-framework jbosshome="${jboss423.home}"/> + <macro-undeploy-framework jbosshome="${jboss423.home}"/> </target> - + + <!-- ================================================================== --> + <!-- Deployment 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}"/> + </target> + + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss500"> + <macro-undeploy-cxf500/> + <macro-undeploy-framework jbosshome="${jboss500.home}"/> + </target> + </project> Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-05 12:58:25 UTC (rev 5565) +++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-05 19:12:33 UTC (rev 5566) @@ -13,170 +13,190 @@ <project> + <patternset id="client.patternset"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.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="saaj-api-*.jar"/> + </patternset> + <!-- ================================================================== --> - <!-- Deployment --> + <!-- Deployment JBoss422 --> <!-- ================================================================== --> - - <!-- 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> - <!-- 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 --> + <!-- 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"/> + <patternset refid="client.patternset"/> </fileset> </copy> - - <!-- BOOTSTRAP JARS --> + + <!-- BOOTSTRAP JARS --> <copy todir="${jboss422.home}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> + <patternset refid="lib.patternset"/> </fileset> </copy> - <!--SERVER JARS --> + <!--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; + <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 --> + <!-- CLIENT JARS --> <fileset dir="${jboss422.home}/client"> - <include name="jbossws-spi.jar"/> + <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-cxf.sar"/> - <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> + <!-- ================================================================== --> + <!-- Deployment JBoss423 --> + <!-- ================================================================== --> + <!-- 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 --> + <!-- 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"/> + <patternset refid="client.patternset"/> </fileset> </copy> - <!-- BOOTSTRAP JARS --> + <!-- BOOTSTRAP JARS --> <copy todir="${jboss423.home}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> + <patternset refid="lib.patternset"/> </fileset> </copy> - - <!--SERVER JARS --> + + <!--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; + <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 --> + <!-- CLIENT JARS --> <fileset dir="${jboss423.home}/client"> - <include name="jbossws-spi.jar"/> + <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-cxf.sar"/> - <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> - + + <!-- ================================================================== --> + <!-- Deployment JBoss500 --> + <!-- ================================================================== --> + + <!-- 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}"> + <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-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"> + <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-cxf.sar"/> + <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + </project> Modified: stack/cxf/trunk/ant-import/macros-deploy-framework.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-framework.xml 2008-02-05 12:58:25 UTC (rev 5565) +++ stack/cxf/trunk/ant-import/macros-deploy-framework.xml 2008-02-05 19:12:33 UTC (rev 5566) @@ -13,60 +13,60 @@ <project> - <macrodef name="macro-deploy-framework"> - <attribute name="thirdpartylibs"/> - <attribute name="jbosshome"/> - <sequential> + <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"/> - + <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> - + <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> + <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> + <macrodef name="macro-undeploy-framework"> + <attribute name="jbosshome"/> + <sequential> + <delete> <!-- BIN SCRIPTS --> - <fileset dir="@{jbosshome}/bin"> - <include name="wsconsume.*"/> - <include name="wsprovide.*"/> - </fileset> - + <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> - + <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> + <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 +</project>