[jbossws-commits] JBossWS SVN: r7627 - stack/metro/trunk/modules/resources/src/main/resources/resources.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Jun 18 04:26:16 EDT 2008
Author: richard.opalka at jboss.com
Date: 2008-06-18 04:26:16 -0400 (Wed, 18 Jun 2008)
New Revision: 7627
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-2229] introduced check-parameters + extracting jbossws-container-beans.xml
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 08:00:14 UTC (rev 7626)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-18 08:26:16 UTC (rev 7627)
@@ -323,6 +323,14 @@
<include name="**/jbossws-@{jbossid}-container.jar"/>
</fileset>
</copy>
+ <unzip dest="@{targetdir}" src="@{targetdir}/jbossws-@{jbossid}-container.jar">
+ <patternset>
+ <include name="META-INF/jbossws-container-beans.xml"/>
+ </patternset>
+ </unzip>
+ <move file="@{targetdir}/META-INF/jbossws-container-beans.xml" tofile="@{targetdir}/jbossws-container-beans.xml"/>
+ <delete file="@{targetdir}/jbossws-@{jbossid}-container.jar"/>
+ <delete dir="@{targetdir}/META-INF"/>
</sequential>
</macrodef>
@@ -333,10 +341,7 @@
<!-- JDK Detection -->
<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"/>
+ <target name="deploy-jbossws-metro42" 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}"/>
@@ -344,10 +349,7 @@
<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"/>
+ <target name="deploy-jbossws-metro50" 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}"/>
@@ -361,6 +363,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 -->
<!-- ================================================================== -->
More information about the jbossws-commits
mailing list