Author: alessio.soldano(a)jboss.com Date: 2008-07-23 15:52:02 -0400 (Wed, 23 Jul 2008) New Revision: 7898 Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: [JBWS-2263] Do not overwrite jbossws-jboss lib on client dir too Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-07-23 14:13:20 UTC (rev 7897) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-07-23 19:52:02 UTC (rev 7898) @@ -158,7 +158,7 @@ <!-- Deploy Client --> <!-- ================================================================== --> - <macrodef name="macro-deploy-jbossws-client"> + <macrodef name="macro-deploy-jbossws-client42"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> @@ -172,6 +172,22 @@ </copy> </sequential> </macrodef> + + <macrodef name="macro-deploy-jbossws-client50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.client.patternset"/> + <!-- JBWS-2263 --> + <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; --> + </fileset> + </copy> + </sequential> + </macrodef> <!-- ================================================================== --> <!-- Deploy Server Lib --> @@ -355,7 +371,7 @@ <target name="deploy-jbossws-native42" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-client42 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-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> @@ -364,7 +380,7 @@ <target name="deploy-jbossws-native50" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>