Author: richard.opalka(a)jboss.com Date: 2008-02-06 09:40:40 -0500 (Wed, 06 Feb 2008) New Revision: 5587 Removed: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml stack/cxf/trunk/ant-import/macros-deploy-framework.xml Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml stack/cxf/trunk/version.properties Log: [JBWS-1982] use macros from binary repository Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-02-06 14:35:23 UTC (rev 5586) +++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-02-06 14:40:40 UTC (rev 5587) @@ -47,6 +47,7 @@ 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"/> @@ -72,7 +73,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> Deleted: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-06 14:35:23 UTC (rev 5586) +++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-06 14:40:40 UTC (rev 5587) @@ -1,202 +0,0 @@ -<?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.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 JBoss422 --> - <!-- ================================================================== --> - - <!-- 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}"> - <patternset refid="client.patternset"/> - </fileset> - </copy> - - <!-- BOOTSTRAP JARS --> - <copy todir="${jboss422.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> - </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"> - <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"/> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deployment JBoss423 --> - <!-- ================================================================== --> - - <!-- 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}"> - <patternset refid="client.patternset"/> - </fileset> - </copy> - - <!-- BOOTSTRAP JARS --> - <copy todir="${jboss423.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> - </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"> - <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"/> - </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> Deleted: stack/cxf/trunk/ant-import/macros-deploy-framework.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-framework.xml 2008-02-06 14:35:23 UTC (rev 5586) +++ stack/cxf/trunk/ant-import/macros-deploy-framework.xml 2008-02-06 14:40:40 UTC (rev 5587) @@ -1,72 +0,0 @@ -<?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> Modified: stack/cxf/trunk/version.properties =================================================================== --- stack/cxf/trunk/version.properties 2008-02-06 14:35:23 UTC (rev 5586) +++ stack/cxf/trunk/version.properties 2008-02-06 14:40:40 UTC (rev 5587) @@ -37,6 +37,7 @@ jbossws-spi=snapshot jbossws-common=snapshot jbossws-framework=snapshot +jbossws-macros=1.0.0.GA jbossws-jboss42=4.2.1.GA apache-xml-commons=1.2