Author: heiko.braun(a)jboss.com Date: 2008-02-07 15:05:51 -0500 (Thu, 07 Feb 2008) New Revision: 5619 Modified: framework/trunk/macros/macros-deploy-cxf.xml framework/trunk/macros/macros-deploy-native.xml framework/trunk/macros/macros-deploy-sunri.xml Log: USe namespaced patternsets in deploy macros Modified: framework/trunk/macros/macros-deploy-cxf.xml =================================================================== --- framework/trunk/macros/macros-deploy-cxf.xml 2008-02-07 20:05:00 UTC (rev 5618) +++ framework/trunk/macros/macros-deploy-cxf.xml 2008-02-07 20:05:51 UTC (rev 5619) @@ -11,18 +11,18 @@ <project> - <patternset id="client.patternset"> + <patternset id="cxf.client.patternset"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> </patternset> - <patternset id="lib.patternset"> + <patternset id="cxf.lib.patternset"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> </patternset> - <patternset id="serverlib.patternset"> + <patternset id="cxf.serverlib.patternset"> <include name="jaxws-api-*.jar"/> <include name="saaj-api-*.jar"/> </patternset> @@ -41,14 +41,14 @@ <!-- CLIENT JARS --> <copy todir="${jboss422.home}/client" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> + <patternset refid="cxf.client.patternset"/> </fileset> </copy> <!-- BOOTSTRAP JARS --> <copy todir="${jboss422.home}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> + <patternset refid="cxf.lib.patternset"/> </fileset> </copy> @@ -66,12 +66,12 @@ <delete> <!-- CLIENT JARS --> <fileset dir="${jboss422.home}/client"> - <patternset refid="client.patternset"/> + <patternset refid="cxf.client.patternset"/> </fileset> <!-- BOOTSTRAP JARS --> <fileset dir="${jboss422.home}/lib"> - <patternset refid="lib.patternset"/> + <patternset refid="cxf.lib.patternset"/> </fileset> </delete> @@ -94,14 +94,14 @@ <!-- CLIENT JARS --> <copy todir="${jboss423.home}/client" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> + <patternset refid="cxf.client.patternset"/> </fileset> </copy> <!-- BOOTSTRAP JARS --> <copy todir="${jboss423.home}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> + <patternset refid="cxf.lib.patternset"/> </fileset> </copy> @@ -119,12 +119,12 @@ <delete> <!-- CLIENT JARS --> <fileset dir="${jboss423.home}/client"> - <patternset refid="client.patternset"/> + <patternset refid="cxf.client.patternset"/> </fileset> <!-- BOOTSTRAP JARS --> <fileset dir="${jboss423.home}/lib"> - <patternset refid="lib.patternset"/> + <patternset refid="cxf.lib.patternset"/> </fileset> </delete> @@ -147,21 +147,21 @@ <!-- CLIENT JARS --> <copy todir="${jboss500.home}/client" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> + <patternset refid="cxf.client.patternset"/> </fileset> </copy> <!-- BOOTSTRAP JARS --> <copy todir="${jboss500.home}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> + <patternset refid="cxf.lib.patternset"/> </fileset> </copy> <!--SERVER JARS --> <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <patternset refid="serverlib.patternset"/> + <patternset refid="cxf.serverlib.patternset"/> </fileset> </copy> @@ -178,17 +178,17 @@ <delete> <!-- CLIENT JARS --> <fileset dir="${jboss500.home}/client"> - <patternset refid="client.patternset"/> + <patternset refid="cxf.client.patternset"/> </fileset> <!-- BOOTSTRAP JARS --> <fileset dir="${jboss500.home}/lib"> - <patternset refid="lib.patternset"/> + <patternset refid="cxf.lib.patternset"/> </fileset> <!--SERVER JARS --> <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib"> - <patternset refid="serverlib.patternset"/> + <patternset refid="cxf.serverlib.patternset"/> </fileset> </delete> Modified: framework/trunk/macros/macros-deploy-native.xml =================================================================== --- framework/trunk/macros/macros-deploy-native.xml 2008-02-07 20:05:00 UTC (rev 5618) +++ framework/trunk/macros/macros-deploy-native.xml 2008-02-07 20:05:51 UTC (rev 5619) @@ -11,14 +11,14 @@ <project> - <patternset id="bin.patternset"> + <patternset id="native.bin.patternset"> <include name="wsconsume.*"/> <include name="wsprovide.*"/> <include name="wsrunclient.*"/> <include name="wstools.*"/> </patternset> - <patternset id="client.stack.patternset"> + <patternset id="native.client.stack.patternset"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-jaxws-ext.jar"/> @@ -26,7 +26,7 @@ <include name="jbossws-client.jar"/> </patternset> - <patternset id="client.patternset"> + <patternset id="native.client.patternset"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -38,12 +38,12 @@ <include name="wsdl4j.jar"/> </patternset> - <patternset id="bc.patternset"> + <patternset id="native.bc.patternset"> <include name="jbossws-wsconsume-impl.jar"/> <include name="jbossws-integration.jar"/> </patternset> - <patternset id="lib.patternset"> + <patternset id="native.lib.patternset"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> </patternset> @@ -106,10 +106,10 @@ <!-- CLIENT JARS --> <copy todir="${jboss405.home}/client" overwrite="true"> <fileset dir="@{stacklibs}"> - <patternset refid="client.stack.patternset"/> + <patternset refid="native.client.stack.patternset"/> </fileset> <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> + <patternset refid="native.client.patternset"/> <!-- AS 4.0.5 specific jars --> <include name="jbossws-jboss40.jar"/> <include name="jboss-xml-binding.jar"/> @@ -166,14 +166,14 @@ <!-- BIN SCRIPTS --> <fileset dir="${jboss405.home}/bin"> - <patternset refid="bin.patternset"/> + <patternset refid="native.bin.patternset"/> </fileset> <!-- CLIENT JARS --> <fileset dir="${jboss405.home}/client"> - <patternset refid="client.stack.patternset"/> - <patternset refid="client.patternset"/> - <patternset refid="bc.patternset"/> + <patternset refid="native.client.stack.patternset"/> + <patternset refid="native.client.patternset"/> + <patternset refid="native.bc.patternset"/> <!-- AS 4.0.5 specific jars --> <include name="jbossws14-client.jar"/> <include name="jbossws-jboss40.jar"/> @@ -184,7 +184,7 @@ <!-- SERVER JARS --> <fileset dir="${jboss405.home}/lib"> - <patternset refid="bc.patternset"/> + <patternset refid="native.bc.patternset"/> <!-- AS 4.0.5 specific jars --> <include name="jboss-xml-binding.jar"/> </fileset> @@ -219,10 +219,10 @@ <!-- CLIENT JARS --> <copy todir="${jboss421.home}/client" overwrite="true"> <fileset dir="@{stacklibs}"> - <patternset refid="client.stack.patternset"/> + <patternset refid="native.client.stack.patternset"/> </fileset> <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> + <patternset refid="native.client.patternset"/> <!-- AS 4.2.1 specific jars --> <include name="jbossws-jboss421.jar"/> <include name="jboss-xml-binding.jar"/> @@ -256,14 +256,14 @@ <!-- BIN SCRIPTS --> <fileset dir="${jboss421.home}/bin"> - <patternset refid="bin.patternset"/> + <patternset refid="native.bin.patternset"/> </fileset> <!-- CLIENT JARS --> <fileset dir="${jboss421.home}/client"> - <patternset refid="client.stack.patternset"/> - <patternset refid="client.patternset"/> - <patternset refid="bc.patternset"/> + <patternset refid="native.client.stack.patternset"/> + <patternset refid="native.client.patternset"/> + <patternset refid="native.bc.patternset"/> <!-- AS 4.2.1 specific jars --> <include name="jbossws-jboss421.jar"/> <include name="jboss-xml-binding.jar"/> @@ -271,13 +271,13 @@ <!-- SERVER JARS --> <fileset dir="${jboss421.home}/lib"> - <patternset refid="bc.patternset"/> + <patternset refid="native.bc.patternset"/> <!-- AS 4.2.1 specific jars --> <include name="jboss-xml-binding.jar"/> </fileset> <fileset dir="${jboss421.home}/server/${jboss.server.instance}/lib"> <patternset refid="native.patternset"/> - <patternset refid="bc.patternset"/> + <patternset refid="native.bc.patternset"/> <!-- AS 4.2.1 specific jars --> <include name="jbossws-jboss421.jar"/> </fileset> @@ -303,10 +303,10 @@ <!-- CLIENT JARS --> <copy todir="${jboss422.home}/client" overwrite="true"> <fileset dir="@{stacklibs}"> - <patternset refid="client.stack.patternset"/> + <patternset refid="native.client.stack.patternset"/> </fileset> <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> + <patternset refid="native.client.patternset"/> </fileset> </copy> @@ -325,23 +325,23 @@ <!-- BIN SCRIPTS --> <fileset dir="${jboss422.home}/bin"> - <patternset refid="bin.patternset"/> + <patternset refid="native.bin.patternset"/> </fileset> <!-- CLIENT JARS --> <fileset dir="${jboss422.home}/client"> - <patternset refid="client.stack.patternset"/> - <patternset refid="client.patternset"/> - <patternset refid="bc.patternset"/> + <patternset refid="native.client.stack.patternset"/> + <patternset refid="native.client.patternset"/> + <patternset refid="native.bc.patternset"/> </fileset> <!-- SERVER JARS --> <fileset dir="${jboss422.home}/lib"> - <patternset refid="bc.patternset"/> + <patternset refid="native.bc.patternset"/> </fileset> <fileset dir="${jboss422.home}/server/${jboss.server.instance}/lib"> <patternset refid="native.patternset"/> - <patternset refid="bc.patternset"/> + <patternset refid="native.bc.patternset"/> </fileset> </delete> <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> @@ -365,10 +365,10 @@ <!-- CLIENT JARS --> <copy todir="${jboss423.home}/client" overwrite="true"> <fileset dir="@{stacklibs}"> - <patternset refid="client.stack.patternset"/> + <patternset refid="native.client.stack.patternset"/> </fileset> <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> + <patternset refid="native.client.patternset"/> </fileset> </copy> @@ -387,23 +387,23 @@ <!-- BIN SCRIPTS --> <fileset dir="${jboss423.home}/bin"> - <patternset refid="bin.patternset"/> + <patternset refid="native.bin.patternset"/> </fileset> <!-- CLIENT JARS --> <fileset dir="${jboss423.home}/client"> - <patternset refid="client.stack.patternset"/> - <patternset refid="client.patternset"/> - <patternset refid="bc.patternset"/> + <patternset refid="native.client.stack.patternset"/> + <patternset refid="native.client.patternset"/> + <patternset refid="native.bc.patternset"/> </fileset> <!-- SERVER JARS --> <fileset dir="${jboss423.home}/lib"> - <patternset refid="bc.patternset"/> + <patternset refid="native.bc.patternset"/> </fileset> <fileset dir="${jboss423.home}/server/${jboss.server.instance}/lib"> <patternset refid="native.patternset"/> - <patternset refid="bc.patternset"/> + <patternset refid="native.bc.patternset"/> </fileset> </delete> <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> @@ -428,17 +428,17 @@ <!-- CLIENT JARS --> <copy todir="${jboss500.home}/client" overwrite="true"> <fileset dir="@{stacklibs}"> - <patternset refid="client.stack.patternset"/> + <patternset refid="native.client.stack.patternset"/> </fileset> <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> + <patternset refid="native.client.patternset"/> </fileset> </copy> <!-- BOOTSTRAP JARS --> <copy todir="${jboss500.home}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> + <patternset refid="native.lib.patternset"/> </fileset> </copy> @@ -463,25 +463,25 @@ <delete> <!-- BIN SCRIPTS --> <fileset dir="${jboss500.home}/bin"> - <patternset refid="bin.patternset"/> + <patternset refid="native.bin.patternset"/> </fileset> <!-- CLIENT JARS --> <fileset dir="${jboss500.home}/client"> - <patternset refid="client.stack.patternset"/> - <patternset refid="client.patternset"/> - <patternset refid="bc.patternset"/> + <patternset refid="native.client.stack.patternset"/> + <patternset refid="native.client.patternset"/> + <patternset refid="native.bc.patternset"/> </fileset> <!-- BOOTSTRAP JARS --> <fileset dir="${jboss500.home}/lib"> - <patternset refid="lib.patternset"/> + <patternset refid="native.lib.patternset"/> </fileset> <!-- SERVER JARS --> <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib"> <patternset refid="native.patternset"/> - <patternset refid="bc.patternset"/> + <patternset refid="native.bc.patternset"/> </fileset> </delete> Modified: framework/trunk/macros/macros-deploy-sunri.xml =================================================================== --- framework/trunk/macros/macros-deploy-sunri.xml 2008-02-07 20:05:00 UTC (rev 5618) +++ framework/trunk/macros/macros-deploy-sunri.xml 2008-02-07 20:05:51 UTC (rev 5619) @@ -11,11 +11,11 @@ <project> - <patternset id="client.stack.patternset"> + <patternset id="metro.client.stack.patternset"> <include name="jbossws-sunri-client.jar"/> </patternset> - <patternset id="client.patternset"> + <patternset id="metro.client.patternset"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -30,12 +30,12 @@ <include name="jboss-wsit-tools.jar"/> </patternset> - <patternset id="lib.patternset"> + <patternset id="metro.lib.patternset"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> </patternset> - <patternset id="serverlib.patternset"> + <patternset id="metro.serverlib.patternset"> <include name="jaxws-api.jar"/> <include name="jsr181-api.jar"/> <include name="saaj-api.jar"/> @@ -52,15 +52,15 @@ <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"/> + <patternset refid="metro.client.stack.patternset"/> </fileset> <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> + <patternset refid="metro.client.patternset"/> </fileset> </copy> <copy todir="${jboss422.home}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> + <patternset refid="metro.lib.patternset"/> </fileset> </copy> <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> @@ -76,13 +76,13 @@ <delete> <!-- CLIENT JARS --> <fileset dir="${jboss422.home}/client"> - <patternset refid="client.stack.patternset"/> - <patternset refid="client.patternset"/> + <patternset refid="metro.client.stack.patternset"/> + <patternset refid="metro.client.patternset"/> </fileset> <!-- BOOTSTRAP JARS --> <fileset dir="${jboss422.home}/lib"> - <patternset refid="lib.patternset"/> + <patternset refid="metro.lib.patternset"/> </fileset> </delete> @@ -102,15 +102,15 @@ <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"/> + <patternset refid="metro.client.stack.patternset"/> </fileset> <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> + <patternset refid="metro.client.patternset"/> </fileset> </copy> <copy todir="${jboss423.home}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> + <patternset refid="metro.lib.patternset"/> </fileset> </copy> <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> @@ -126,13 +126,13 @@ <delete> <!-- CLIENT JARS --> <fileset dir="${jboss423.home}/client"> - <patternset refid="client.stack.patternset"/> - <patternset refid="client.patternset"/> + <patternset refid="metro.client.stack.patternset"/> + <patternset refid="metro.client.patternset"/> </fileset> <!-- BOOTSTRAP JARS --> <fileset dir="${jboss423.home}/lib"> - <patternset refid="lib.patternset"/> + <patternset refid="metro.lib.patternset"/> </fileset> </delete> @@ -154,24 +154,24 @@ <!-- CLIENT JARS --> <copy todir="${jboss500.home}/client" overwrite="true"> <fileset dir="@{stacklibs}"> - <patternset refid="client.stack.patternset"/> + <patternset refid="metro.client.stack.patternset"/> </fileset> <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> + <patternset refid="metro.client.patternset"/> </fileset> </copy> <!-- BOOTSTRAP JARS --> <copy todir="${jboss500.home}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> + <patternset refid="metro.lib.patternset"/> </fileset> </copy> <!--SERVER JARS --> <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <patternset refid="serverlib.patternset"/> + <patternset refid="metro.serverlib.patternset"/> </fileset> </copy> @@ -188,18 +188,18 @@ <delete> <!-- CLIENT JARS --> <fileset dir="${jboss500.home}/client"> - <patternset refid="client.stack.patternset"/> - <patternset refid="client.patternset"/> + <patternset refid="metro.client.stack.patternset"/> + <patternset refid="metro.client.patternset"/> </fileset> <!-- BOOTSTRAP JARS --> <fileset dir="${jboss500.home}/lib"> - <patternset refid="lib.patternset"/> + <patternset refid="metro.lib.patternset"/> </fileset> <!-- SERVER JARS --> <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib"> - <patternset refid="serverlib.patternset"/> + <patternset refid="metro.serverlib.patternset"/> </fileset> </delete>