Author: thomas.diesler(a)jboss.com Date: 2008-04-10 06:39:19 -0400 (Thu, 10 Apr 2008) New Revision: 6324 Modified: stack/metro/trunk/ant-import/jbossws-deploy-macros.xml Log: Split deployment to lib dir for AS42, AS50 Modified: stack/metro/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-10 10:31:50 UTC (rev 6323) +++ stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-10 10:39:19 UTC (rev 6324) @@ -50,10 +50,7 @@ </patternset> <patternset id="jbossws.lib.patternset"> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/wstx.jar"/> + <include name="**/nothing-to-deploy"/> </patternset> <patternset id="jbossws.lib.endorsed.patternset"> @@ -91,7 +88,6 @@ <include name="**/jsr173_api.jar"/> <include name="**/jsr250-api.jar"/> <include name="**/mimepull.jar"/> - <include name="**/wsit-resolver.jar"/> <include name="**/saaj-api.jar"/> <include name="**/saaj-impl.jar"/> <include name="**/sjsxp.jar"/> @@ -100,6 +96,7 @@ <include name="**/streambuffer.jar"/> <include name="**/txnannprocessor.jar"/> <include name="**/wsdl4j.jar"/> + <include name="**/wsit-resolver.jar"/> <include name="**/wstx.jar"/> <include name="**/xmldsig.jar"/> <include name="**/xws-security.jar"/> @@ -126,7 +123,7 @@ <!-- Deploy Lib --> <!-- ================================================================== --> - <macrodef name="macro-deploy-jbossws-lib"> + <macrodef name="macro-deploy-jbossws-lib42"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> <sequential> @@ -139,6 +136,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 --> <!-- ================================================================== --> @@ -261,7 +275,7 @@ <target name="deploy-jbossws-metro42" 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-metro42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/> @@ -269,7 +283,7 @@ <target name="deploy-jbossws-metro50" 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-metro50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}"/>