[jbossws-commits] JBossWS SVN: r7625 - in stack/metro/trunk: src/main/distro and 1 other directory.

Author: richard.opalka(a)jboss.com Date: 2008-06-18 03:55:24 -0400 (Wed, 18 Jun 2008) New Revision: 7625 Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/metro/trunk/src/main/distro/build-deploy.xml Log: [JBWS-2229] fix deploy macros Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-18 07:21:33 UTC (rev 7624) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-18 07:55:24 UTC (rev 7625) @@ -227,13 +227,14 @@ <!-- ================================================================== --> <macrodef name="macro-deploy-jbossws-sar42"> + <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true"> - <fileset dir="@{artifactsdir}/lib"> + <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.service.lib.patternset"/> <include name="**/jaxb-api.jar"/> <include name="**/jaxb-impl.jar"/> @@ -242,7 +243,7 @@ </fileset> </copy> <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; - <fileset dir="@{artifactsdir}/lib"> + <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-metro-management.war"/> </fileset> </unzip> @@ -258,18 +259,19 @@ </macrodef> <macrodef name="macro-deploy-jbossws-sar50"> + <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}/lib"> + <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.service.lib.patternset"/> </fileset> </copy> <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; - <fileset dir="@{artifactsdir}/lib"> + <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-metro-management.war"/> </fileset> </unzip> @@ -286,13 +288,14 @@ <!-- ================================================================== --> <macrodef name="macro-deploy-jbossws-deployers50"> + <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}/lib"> + <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; @@ -315,13 +318,11 @@ <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest=&quot;(a){targetdir}/jbossws.sar&quot; src=&quot;@{thirdpartydir}/jbossws-(a){jbossid}-container.jar&quot;&gt; - <patternset> - <include name="META-INF/jbossws-container-beans.xml"/> - </patternset> - </unzip> - <move file=&quot;(a){targetdir}/jbossws.sar/META-INF/jbossws-container-beans.xml&quot; todir="@{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> @@ -333,25 +334,31 @@ <available classname="java.io.Console" property="HAVE_JDK_1.6"/> <target name="deploy-jbossws-metro42" depends="deploy-jbossws-endorsed"> + <fail message="installserver must be specified" unless="installserver"/> + <fail message="artifactsdir must be specified" unless="artifactsdir"/> + <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> + <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-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> </target> <target name="deploy-jbossws-metro50" depends="deploy-jbossws-endorsed"> + <fail message="installserver must be specified" unless="installserver"/> + <fail message="artifactsdir must be specified" unless="artifactsdir"/> + <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-client 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}"/> + <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> </target> <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> </target> <!-- ================================================================== --> @@ -391,4 +398,4 @@ </sequential> </macrodef> -</project> \ No newline at end of file +</project> Modified: stack/metro/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-deploy.xml 2008-06-18 07:21:33 UTC (rev 7624) +++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-06-18 07:55:24 UTC (rev 7625) @@ -23,6 +23,7 @@ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> @@ -85,6 +86,7 @@ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target>