From 7ec9f294c4616dcbdeacb9ed02281f0dc75ba128 Mon Sep 17 00:00:00 2001
From: Richard Millet <remillet@gmail.com>
Date: Tue, 7 Jan 2020 11:11:08 -0800
Subject: [PATCH] DRYD-806: Updated 'undeploy' targets to remove Nuxeo
 artifacts from the plugins directory.

---
 services/batch/3rdparty/nuxeo-platform-cs-batch/build.xml | 4 +++-
 services/build.xml                                        | 4 ++++
 services/common/build.xml                                 | 6 ++++++
 services/report/3rdparty/build.xml                        | 7 +++++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/services/batch/3rdparty/nuxeo-platform-cs-batch/build.xml b/services/batch/3rdparty/nuxeo-platform-cs-batch/build.xml
index eb9380a5c..8b1fbe0e9 100644
--- a/services/batch/3rdparty/nuxeo-platform-cs-batch/build.xml
+++ b/services/batch/3rdparty/nuxeo-platform-cs-batch/build.xml
@@ -14,6 +14,8 @@
         value="org.collectionspace.services.batch.3rdparty.nuxeo-${cspace.release}.jar"/>
     <property name="nuxeo.batch.jars.all"
         value="org.collectionspace.services.batch.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.batch.jars.extra"
+        value="collectionspace.batch.*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -123,11 +125,11 @@
         <delete>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.batch.jars.all}"/>
+                <include name="${nuxeo.batch.jars.extra}"/>
             </fileset>
         </delete>
     </target>
 
-
     <target name="dist"
         description="generate distribution for batch doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
diff --git a/services/build.xml b/services/build.xml
index 38d71e2b3..0e2e2c478 100644
--- a/services/build.xml
+++ b/services/build.xml
@@ -178,6 +178,8 @@
         <ant antfile="conservation/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="valuationcontrol/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="objectexit/build.xml" target="deploy" inheritAll="false"/>
+        <ant antfile="propagation/build.xml" target="deploy" inheritAll="false"/>
+        <ant antfile="pottag/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="batch/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="location/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="place/build.xml" target="deploy" inheritAll="false"/>
@@ -219,6 +221,8 @@
         <ant antfile="work/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="place/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="location/build.xml" target="undeploy" inheritAll="false"/>
+        <ant antfile="pottag/build.xml" target="undeploy" inheritAll="false"/>
+        <ant antfile="propagation/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="objectexit/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="valuationcontrol/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="claim/build.xml" target="undeploy" inheritAll="false"/>
diff --git a/services/common/build.xml b/services/common/build.xml
index c5fce124a..875ed7c1c 100644
--- a/services/common/build.xml
+++ b/services/common/build.xml
@@ -214,6 +214,7 @@
 		-->
         <delete failonerror="false" file="${jee.server.cspace}/lib/${common.jar}"/>
         <delete failonerror="false" dir="${jee.server.cspace}/cspace/config/services"/>
+
     </target>
 
     <target name="undeploy_nuxeo"
@@ -221,6 +222,11 @@
         <delete>
             <fileset dir="${jee.server.cspace}/lib" includes="nuxeo-*.jar"/>
         </delete>
+        <delete>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="collectionspace.shared.schema.collectionspace_core.jar"/>
+            </fileset>
+        </delete>
     </target>
 
     <target name="undeploy_spring"
diff --git a/services/report/3rdparty/build.xml b/services/report/3rdparty/build.xml
index 042362b7d..0456a6a89 100644
--- a/services/report/3rdparty/build.xml
+++ b/services/report/3rdparty/build.xml
@@ -9,6 +9,8 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
+    <property name="nuxeo.report.jars.all"
+        value="collectionspace.report.*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -155,6 +157,11 @@
     </target>
 
     <target name="undeploy" depends="undeploy_report_files" description="Undeploy report-related artifacts">
+        <delete>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.report.jars.all}"/>
+            </fileset>
+        </delete>
     </target>
 
     <target name="dist" description="Generate distribution for report" depends="package">
-- 
2.47.3