[jbossws-commits] JBossWS SVN: r7628 - stack/cxf/trunk/modules/resources/src/main/resources/resources.

Author: richard.opalka(a)jboss.com Date: 2008-06-18 04:32:21 -0400 (Wed, 18 Jun 2008) New Revision: 7628 Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: [JBWS-2231] introduced check-parameters + extracting jbossws-container-beans.xml Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-18 08:26:16 UTC (rev 7627) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-18 08:32:21 UTC (rev 7628) @@ -316,6 +316,14 @@ <include name=&quot;**/jbossws-(a){jbossid}-container.jar&quot;/&gt; </fileset> </copy> + <unzip dest="@{targetdir}" src=&quot;@{targetdir}/jbossws-(a){jbossid}-container.jar&quot;&gt; + <patternset> + <include name="META-INF/jbossws-container-beans.xml"/> + </patternset> + </unzip> + <move file=&quot;(a){targetdir}/META-INF/jbossws-container-beans.xml&quot; tofile=&quot;(a){targetdir}/jbossws-container-beans.xml&quot;/&gt; + <delete file=&quot;@{targetdir}/jbossws-(a){jbossid}-container.jar&quot;/&gt; + <delete dir="@{targetdir}/META-INF"/> </sequential> </macrodef> @@ -326,10 +334,7 @@ <!-- JDK Detection --> <available classname="java.io.Console" property="HAVE_JDK_1.6"/> - <target name="deploy-jbossws-cxf42" 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"/> + <target name="deploy-jbossws-cxf42" 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-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> @@ -337,10 +342,7 @@ <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> </target> - <target name="deploy-jbossws-cxf50" 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"/> + <target name="deploy-jbossws-cxf50" 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-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> @@ -354,6 +356,12 @@ <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> </target> + <target name="check-parameters"> + <fail message="installserver must be specified" unless="installserver"/> + <fail message="artifactsdir must be specified" unless="artifactsdir"/> + <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> + </target> + <!-- ================================================================== --> <!-- Undeploy JBossWS --> <!-- ================================================================== -->