Author: thomas.diesler(a)jboss.com Date: 2008-04-25 10:08:28 -0400 (Fri, 25 Apr 2008) New Revision: 6702 Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml Log: Delete two digit container integration Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 13:24:27 UTC (rev 6701) +++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 14:08:28 UTC (rev 6702) @@ -14,9 +14,9 @@ <project> <!-- - These patterns should be common for all supported containers. - All jars must also be declared in component-info.xml to ensure - that the AS build uses the same version. + These patterns should be common for all supported containers. + All jars must also be declared in component-info.xml to ensure + that the AS build uses the same version. --> <patternset id="jbossws.bin.patternset"> <include name="**/wsconsume.bat"/> @@ -113,7 +113,7 @@ <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.lib.patternset"/> + <patternset refid="jbossws.lib.patternset"/> </fileset> </copy> </sequential> @@ -135,51 +135,56 @@ </copy> </sequential> </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Deployers --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-deployers50"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> - <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - </fileset> - </copy> - <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-deployer-beans.xml"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Deploy --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-deploy50"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name=&quot;**/jbossws-(a){jbossid}-container.jar&quot;/&gt; - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> + + <!-- ================================================================== --> + <!-- Deploy Deployers --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-deployers50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <delete> + <fileset dir="@{targetdir}"> + <include name="jbossws-jboss*.jar"/> + </fileset> + </delete> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + </fileset> + </copy> + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-deployer-beans.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Deploy --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-deploy50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name=&quot;**/jbossws-(a){jbossid}-container.jar&quot;/&gt; + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> <!-- Deploy Lib Endorsed --> <!-- ================================================================== --> @@ -206,6 +211,11 @@ <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> + <delete> + <fileset dir="@{targetdir}"> + <include name="jbossws-jboss*.jar"/> + </fileset> + </delete> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> @@ -225,6 +235,11 @@ <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> + <delete> + <fileset dir="@{targetdir}"> + <include name="jbossws-jboss*.jar"/> + </fileset> + </delete> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.server.lib.patternset"/> @@ -246,7 +261,7 @@ </copy> </sequential> </macrodef> - + <!-- ================================================================== --> <!-- Deploy JBossWS Service --> <!-- ================================================================== --> @@ -328,7 +343,8 @@ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-native42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-native42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}" + jbossid="${jbossid}"/> </target> <target name="deploy-jbossws-native50" depends="deploy-jbossws-endorsed">