[jbossws-commits] JBossWS SVN: r6704 - stack/native/trunk/ant-import.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-04-25 10:36:01 -0400 (Fri, 25 Apr 2008)
New Revision: 6704

Modified:
   stack/native/trunk/ant-import/build-deploy.xml
   stack/native/trunk/ant-import/jbossws-deploy-macros.xml
Log:
Undeploy integration from as50 deployer

Modified: stack/native/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml	2008-04-25 14:24:11 UTC (rev 6703)
+++ stack/native/trunk/ant-import/build-deploy.xml	2008-04-25 14:36:01 UTC (rev 6704)
@@ -150,6 +150,7 @@
   <target name="undeploy-jboss500" depends="deploy-target-jboss500" description="Remove jbossws from jboss500">
     <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
     <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+    <macro-undeploy-deployer targetdir="${jboss500.server.deploy}/jbossws.sar"/>
     <delete dir="${jboss500.server.deploy}/juddi-service.sar"/>
   </target>
   
@@ -173,6 +174,7 @@
   <target name="undeploy-jboss501" depends="deploy-target-jboss501" description="Remove jbossws from jboss501">
     <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
     <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+    <macro-undeploy-deployer targetdir="${jboss501.server.deploy}/jbossws.sar"/>
     <delete dir="${jboss501.server.deploy}/juddi-service.sar"/>
   </target>
   

Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/ant-import/jbossws-deploy-macros.xml	2008-04-25 14:24:11 UTC (rev 6703)
+++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml	2008-04-25 14:36:01 UTC (rev 6704)
@@ -364,9 +364,6 @@
       
       <!-- delete stale container integration jars -->
       <delete>
-        <fileset dir="${jboss.server.home}/deployers/jbossws.deployer">
-          <include name="jbossws-jboss*.jar"/>
-        </fileset>
         <fileset dir="${jboss.server.home}/lib">
           <include name="jbossws-jboss*.jar"/>
         </fileset>
@@ -386,4 +383,17 @@
     </sequential>
   </macrodef>
   
+  <macrodef name="macro-undeploy-deployer">
+    <attribute name="defaultconf"/>
+    <attribute name="targetdir"/>
+    <sequential>
+      <property name="jboss.server.home" value="@{targetdir}/../.."/>
+      <delete>
+        <fileset dir="${jboss.server.home}/deployers/jbossws.deployer">
+          <include name="jbossws-jboss*.jar"/>
+        </fileset>
+      </delete>
+    </sequential>
+  </macrodef>
+  
 </project>
\ No newline at end of file