Author: thomas.diesler(a)jboss.com Date: 2008-04-10 06:43:07 -0400 (Thu, 10 Apr 2008) New Revision: 6326 Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml Log: Split deployment to lib dir for AS42, AS50 Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-10 10:41:52 UTC (rev 6325) +++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-10 10:43:07 UTC (rev 6326) @@ -54,8 +54,7 @@ </patternset> <patternset id="jbossws.lib.patternset"> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxb-impl.jar"/> + <include name="**/nothing-to-deploy"/> </patternset> <patternset id="jbossws.lib.endorsed.patternset"> @@ -107,7 +106,7 @@ <!-- Deploy Lib --> <!-- ================================================================== --> - <macrodef name="macro-deploy-jbossws-lib"> + <macrodef name="macro-deploy-jbossws-lib42"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> <sequential> @@ -120,6 +119,23 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-lib50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.lib.patternset"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wstx.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy Lib Endorsed --> <!-- ================================================================== --> @@ -247,7 +263,7 @@ <target name="deploy-jbossws-native42" depends="deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-native42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/> @@ -255,7 +271,7 @@ <target name="deploy-jbossws-native50" depends="deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-native50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}"/>