Author: thomas.diesler(a)jboss.com
Date: 2007-11-28 12:01:49 -0500 (Wed, 28 Nov 2007)
New Revision: 5137
Modified:
stack/native/trunk/ant-import/build-deploy.xml
stack/native/trunk/ant-import/macros-deploy-native.xml
Log:
Fix deploy-jboss422
Modified: stack/native/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml 2007-11-28 16:39:06 UTC (rev 5136)
+++ stack/native/trunk/ant-import/build-deploy.xml 2007-11-28 17:01:49 UTC (rev 5137)
@@ -57,7 +57,7 @@
<!-- Deploy jbossws to jboss422 -->
<target name="deploy-jboss422"
depends="jars-jboss42,undeploy-jboss422,deploy-jboss422-endorsed"
description="Deploy jbossws to jboss422">
<fail message="Not available: ${jboss422.available.file}"
unless="jboss422.available"/>
- <macro-deploy-native422 jbosshome="${jboss422.home}"
stacklibs="${core.dir}/output/lib"
thirdpartylibs="${core.dir}/thirdparty"/>
+ <macro-deploy-native422 stacklibs="${core.dir}/output/lib"
thirdpartylibs="${core.dir}/thirdparty"/>
<macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty"
jbosshome="${jboss422.home}"/>
</target>
@@ -68,7 +68,7 @@
<!-- Remove jbossws from jboss422 -->
<target name="undeploy-jboss422"
depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws
from jboss422">
<fail message="Not available: ${jboss422.available.file}"
unless="jboss422.available"/>
- <macro-undeploy-native422 jbosshome="${jboss422.home}"/>
+ <macro-undeploy-native422/>
<macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
<target name="undeploy-jboss422-endorsed" depends="prepare">
Modified: stack/native/trunk/ant-import/macros-deploy-native.xml
===================================================================
--- stack/native/trunk/ant-import/macros-deploy-native.xml 2007-11-28 16:39:06 UTC (rev
5136)
+++ stack/native/trunk/ant-import/macros-deploy-native.xml 2007-11-28 17:01:49 UTC (rev
5137)
@@ -309,16 +309,14 @@
<macrodef name="macro-deploy-native422">
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
- <attribute name="jbosshome"/>
<sequential>
-
<!-- BIN SCRIPTS -->
- <unzip dest="@{jbosshome}/bin"
src="(a){stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="@{jbosshome}/bin" perm="+x"
includes="*.sh"/>
+ <unzip dest="${jboss422.home}/bin"
src="(a){stacklibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${jboss422.home}/bin" perm="+x"
includes="*.sh"/>
<!-- CLIENT JARS -->
- <copy todir="@{jbosshome}/client" overwrite="true">
+ <copy todir="${jboss422.home}/client" overwrite="true">
<fileset dir="@{stacklibs}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
@@ -340,21 +338,20 @@
</copy>
<!-- SERVER JARS -->
- <mkdir
dir="(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar
dest="(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="(a){stacklibs}/jbossws-native42.sar"/>
- <mkdir
dir="(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip
dest="(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"
src="(a){thirdpartylibs}/juddi-service.sar"/>
+ <mkdir
dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar
dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="(a){stacklibs}/jbossws-native42.sar"/>
+ <mkdir
dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip
dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"
src="(a){thirdpartylibs}/juddi-service.sar"/>
</sequential>
</macrodef>
<macrodef name="macro-undeploy-native422">
- <attribute name="jbosshome"/>
<sequential>
<delete>
<!-- BIN SCRIPTS -->
- <fileset dir="@{jbosshome}/bin">
+ <fileset dir="${jboss422.home}/bin">
<include name="wsconsume.*"/>
<include name="wsprovide.*"/>
<include name="wsrunclient.*"/>
@@ -362,7 +359,7 @@
</fileset>
<!-- CLIENT JARS -->
- <fileset dir="@{jbosshome}/client">
+ <fileset dir="${jboss422.home}/client">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
@@ -382,14 +379,14 @@
</fileset>
<!-- SERVER JARS -->
- <fileset dir="@{jbosshome}/lib/endorsed">
+ <fileset dir="${jboss422.home}/lib/endorsed">
<include name="jaxb-api.jar"/>
</fileset>
- <fileset dir="@{jbosshome}/lib">
+ <fileset dir="${jboss422.home}/lib">
<!-- Remove only, do not deploy -->
<include name="jbossws-integration.jar"/>
</fileset>
- <fileset dir="(a){jbosshome}/server/${jboss.server.instance}/lib">
+ <fileset
dir="${jboss422.home}/server/${jboss.server.instance}/lib">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-jaxws-ext.jar"/>
@@ -398,8 +395,8 @@
<include name="jbossws-integration.jar"/>
</fileset>
</delete>
- <delete
dir="(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete
dir="(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <delete
dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete
dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
Show replies by date