Author: richard.opalka(a)jboss.com Date: 2008-02-05 14:56:17 -0500 (Tue, 05 Feb 2008) New Revision: 5567 Modified: stack/metro/trunk/ant-import/build-deploy.xml stack/metro/trunk/ant-import/macros-deploy-framework.xml stack/metro/trunk/ant-import/macros-deploy-sunri.xml Log: [JBWS-1982] optimization Modified: stack/metro/trunk/ant-import/build-deploy.xml =================================================================== --- stack/metro/trunk/ant-import/build-deploy.xml 2008-02-05 19:12:33 UTC (rev 5566) +++ stack/metro/trunk/ant-import/build-deploy.xml 2008-02-05 19:56:17 UTC (rev 5567) @@ -13,67 +13,64 @@ <project> - <import file="${int.sunri.dir}/ant-import/macros-deploy-framework.xml"/> - <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/> + <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"> - <macro-deploy-sunri422 - stacklibs="${int.sunri.dir}/output/lib" - thirdpartylibs="${int.sunri.dir}/thirdparty"/> + <target name="deploy-jboss422" depends="jars-jboss422,undeploy-jboss422" description="Deploy jbossws/sunri to jboss42"> + <macro-deploy-sunri422 + stacklibs="${int.sunri.dir}/output/lib" + thirdpartylibs="${int.sunri.dir}/thirdparty"/> - <macro-deploy-framework - thirdpartylibs="${int.sunri.dir}/thirdparty" - jbosshome="${jboss422.home}"/> - </target> + <macro-deploy-framework + thirdpartylibs="${int.sunri.dir}/thirdparty" + jbosshome="${jboss422.home}"/> + </target> - <!-- Remove from jboss422 --> - <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss42"> - <macro-undeploy-sunri422/> - <macro-undeploy-framework jbosshome="${jboss422.home}"/> - </target> + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss42"> + <macro-undeploy-sunri422/> + <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"> - <macro-deploy-sunri423 - stacklibs="${int.sunri.dir}/output/lib" - thirdpartylibs="${int.sunri.dir}/thirdparty"/> + <target name="deploy-jboss423" depends="jars-jboss423, undeploy-jboss423" description="Deploy jbossws/sunri to jboss42"> + <macro-deploy-sunri423 + stacklibs="${int.sunri.dir}/output/lib" + thirdpartylibs="${int.sunri.dir}/thirdparty"/> - <macro-deploy-framework - thirdpartylibs="${int.sunri.dir}/thirdparty" - jbosshome="${jboss423.home}"/> - </target> + <macro-deploy-framework + thirdpartylibs="${int.sunri.dir}/thirdparty" + jbosshome="${jboss423.home}"/> + </target> - <!-- Remove from jboss423 --> - <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/sunri from jboss42"> - <macro-undeploy-sunri423/> - <macro-undeploy-framework jbosshome="${jboss423.home}"/> - </target> + <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/sunri from jboss42"> + <macro-undeploy-sunri423/> + <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"> - <macro-deploy-sunri500 - stacklibs="${int.sunri.dir}/output/lib" - thirdpartylibs="${int.sunri.dir}/thirdparty"/> + <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/sunri to jboss50"> + <macro-deploy-sunri500 + stacklibs="${int.sunri.dir}/output/lib" + thirdpartylibs="${int.sunri.dir}/thirdparty"/> - <macro-deploy-framework - thirdpartylibs="${int.sunri.dir}/thirdparty" - jbosshome="${jboss500.home}"/> - </target> + <macro-deploy-framework + thirdpartylibs="${int.sunri.dir}/thirdparty" + jbosshome="${jboss500.home}"/> + </target> - <!-- Remove from jboss500 --> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50"> - <macro-undeploy-sunri500/> - <macro-undeploy-framework jbosshome="${jboss500.home}"/> - </target> + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50"> + <macro-undeploy-sunri500/> + <macro-undeploy-framework jbosshome="${jboss500.home}"/> + </target> </project> Modified: stack/metro/trunk/ant-import/macros-deploy-framework.xml =================================================================== --- stack/metro/trunk/ant-import/macros-deploy-framework.xml 2008-02-05 19:12:33 UTC (rev 5566) +++ stack/metro/trunk/ant-import/macros-deploy-framework.xml 2008-02-05 19:56:17 UTC (rev 5567) @@ -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> Modified: stack/metro/trunk/ant-import/macros-deploy-sunri.xml =================================================================== --- stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2008-02-05 19:12:33 UTC (rev 5566) +++ stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2008-02-05 19:56:17 UTC (rev 5567) @@ -13,222 +13,200 @@ <project> - <!-- ================================================================== --> - <!-- Deployment JBoss422 --> - <!-- ================================================================== --> + <patternset id="client.stack.patternset"> + <include name="jbossws-sunri-client.jar"/> + </patternset> - <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}"> - <include name="jbossws-sunri-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="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"/> - </fileset> - </copy> - <copy todir="${jboss422.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </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=&quot;(a){stacklibs}/jbossws-sunri42.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> + <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> - <!-- Remove jbossws/sunri from jboss422 --> - <macrodef name="macro-undeploy-sunri422"> - <sequential> - <delete> - <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="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"/> - <include name="jbossws-sunri-client.jar"/> - </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> + <patternset id="lib.patternset"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </patternset> - <!-- ================================================================== --> - <!-- Deployment JBoss423 --> - <!-- ================================================================== --> + <patternset id="serverlib.patternset"> + <include name="jaxws-api.jar"/> + <include name="jsr181-api.jar"/> + <include name="saaj-api.jar"/> + </patternset> - <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}"> - <include name="jbossws-sunri-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="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"/> - <include name="jboss-wsit-tools.jar"/> - </fileset> - </copy> - <copy todir="${jboss423.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </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=&quot;(a){stacklibs}/jbossws-sunri42.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> + <!-- ================================================================== --> + <!-- Deployment JBoss422 --> + <!-- ================================================================== --> - <!-- Remove jbossws/sunri from jboss423 --> - <macrodef name="macro-undeploy-sunri423"> - <sequential> - <delete> - <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="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"/> - <include name="jbossws-sunri-client.jar"/> - <include name="jboss-wsit-tools.jar"/> - </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> + <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=&quot;(a){stacklibs}/jbossws-sunri42.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> - <!-- ================================================================== --> - <!-- Deployment JBoss500 --> - <!-- ================================================================== --> + <!-- 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> - <macrodef name="macro-deploy-sunri500"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <!-- BOOTSTRAP JARS --> + <fileset dir="${jboss422.home}/lib"> + <patternset refid="lib.patternset"/> + </fileset> + </delete> - <!-- CLIENT JARS --> - <copy todir="${jboss500.home}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <include name="jbossws-sunri-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="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"/> - </fileset> - </copy> + <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> - <!-- BOOTSTRAP JARS --> - <copy todir="${jboss500.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> - </copy> + <!-- ================================================================== --> + <!-- 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=&quot;(a){stacklibs}/jbossws-sunri42.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> + + <!-- 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}"> - <include name="jaxws-api.jar"/> - <include name="jsr181-api.jar"/> - <include name="saaj-api.jar"/> - </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=&quot;(a){stacklibs}/jbossws-sunri50.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> + <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=&quot;(a){stacklibs}/jbossws-sunri50.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> - <!-- Remove jbossws/sunri from jboss500 --> - <macrodef name="macro-undeploy-sunri500"> - <sequential> - <delete> + <!-- 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> - <!-- 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="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"/> - <include name="jbossws-sunri-client.jar"/> - </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> - <!-- SERVER JARS --> - <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib"> - <include name="jaxws-api.jar"/> - <include name="jsr181-api.jar"/> - <include name="saaj-api.jar"/> - </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> + <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> </project>