[jbossws-commits] JBossWS SVN: r4891 - stack/native/tags/jbossws-native-2.0.1.SP2/ant-import.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-10-26 04:10:39 -0400 (Fri, 26 Oct 2007)
New Revision: 4891

Modified:
   stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/build-deploy.xml
   stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/build-thirdparty.xml
Log:
Fix deploy-jboss42 for AS4.2.1

Modified: stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/build-deploy.xml
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/build-deploy.xml	2007-10-26 05:21:22 UTC (rev 4890)
+++ stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/build-deploy.xml	2007-10-26 08:10:39 UTC (rev 4891)
@@ -15,6 +15,9 @@
 
 	<import file="${core.dir}/ant-import/macros-deploy-framework.xml"/>
 	<import file="${core.dir}/ant-import/macros-deploy-native.xml"/>
+
+  <!-- Check availability of container integration -->
+  <available property="jbossws.jboss42.available" file="${jboss42.home}/server/${jboss.server.instance}/lib/jbossws-jboss42.jar"/>
   
 	<!-- ================================================================== -->
 	<!-- Deployment  JBoss50                                                -->
@@ -48,7 +51,7 @@
 	</target>
 
 	<!-- Deploy jbossws to jboss42 -->
-	<target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws to jboss42">
+	<target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42,deploy-jboss42-endorsed, deploy-jboss421" description="Deploy jbossws to jboss42">
 		<macro-deploy-native42
 				stacklibs="${core.dir}/output/lib"
 				thirdpartylibs="${core.dir}/thirdparty"/>
@@ -64,6 +67,12 @@
 				thirdpartylibs="${core.dir}/thirdparty"/>
 	</target>
 
+  <!-- Container integration is not contained in the jbossws.sar -->
+	<target name="deploy-jboss421" depends="prepare" unless="jbossws.jboss42.available">
+    <copy file="${thirdparty.dir}/jbossws-jboss421.jar" tofile="${jboss42.home}/server/${jboss.server.instance}/lib/jbossws-jboss42.jar"/>
+    <copy file="${thirdparty.dir}/jbossws-jboss421.jar" tofile="${jboss42.home}/client/jbossws-jboss42.jar"/>
+	</target>
+
 	<!-- Remove jbossws from jboss42 -->
 	<target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws from jboss42">
 		<macro-undeploy-native42/>

Modified: stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/build-thirdparty.xml	2007-10-26 05:21:22 UTC (rev 4890)
+++ stack/native/tags/jbossws-native-2.0.1.SP2/ant-import/build-thirdparty.xml	2007-10-26 08:10:39 UTC (rev 4891)
@@ -56,6 +56,7 @@
     <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-resources.zip" dest="${thirdparty.dir}/jbossws-jboss40-resources.zip" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-src.zip" dest="${thirdparty.dir}/jbossws-jboss40-src.zip" usetimestamp="true" verbose="true"/>
+    <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss421.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
 	      
     <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/>