From f05b2c4485d2929ca49eb4482bea72ad14ecac52 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Mon, 12 Aug 2013 19:19:14 -0700
Subject: [PATCH] CSPACE-6142: When undeploying current and legacy Nuxeo
 doctype JARs, account for naming variations in the CollectionObject lifesci
 schema extension and the Vocabulary service.

---
 .../build.xml                                 | 32 +++++++++++++------
 .../nuxeo-platform-cs-vocabulary/build.xml    |  6 ++--
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
index 9c5e38dd9..c85a19c9f 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
@@ -13,14 +13,16 @@
     <property name="build" location="build"/>
     <property name="dist"  location="dist"/>
     <!-- JAR files used by CollectionSpace 4.0 and later -->
-    <property name="nuxeo.collectionobject.doctype.jars.all"
-        value="collectionspace.collectionobject.doctype*.jar"/>
+    <!-- Doctype JAR(s) are removed via the 'undeploy' target in the -->
+    <!-- Ant buildfile for the common schema -->
     <property name="nuxeo.collectionobject.schema.naturalhistory.jars.all"
         value="collectionspace.collectionobject.schema*_naturalhistory.jar"/>
     <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
-    <property name="nuxeo.collectionobject.legacy.jars.all"
-        value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-*.jar"/>
-    <property name="nuxeo.collectionobject.jar"
+    <!-- Additional legacy JAR(s) are removed via the 'undeploy' target in the -->
+    <!-- Ant buildfile for the common schema -->
+    <property name="nuxeo.collectionobject.lifesci.legacy.jars.all"
+        value="org.collectionspace.services.collectionobject.3rdparty.lifesci.nuxeo-*.jar"/>
+    <property name="nuxeo.collectionobject.lifesci.legacy.jar"
         value="org.collectionspace.services.collectionobject.3rdparty.lifesci.nuxeo-${cspace.release}.jar"/>
     
     <condition property="osfamily-unix">
@@ -126,15 +128,27 @@
         description="deploy collectionobject doctype in ${jee.server.nuxeo}">
         <!-- This target is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
         leaving this only for backwards compatibility reasons. -->  
-        <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"
+        <copy file="${basedir}/target/${nuxeo.collectionobject.lifesci.legacy.jar}"
             todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy collectionobject doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Doctype JAR(s) are removed via the 'undeploy' Ant target in the -->
+            <!-- buildfile for the common schema -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.collectionobject.jars.all}"/>
+                <include name="${nuxeo.collectionobject.schema.naturalhistory.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
+            <!-- Additional legacy JAR(s) are removed via the 'undeploy' target in the -->
+            <!-- Ant buildfile for the common schema -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.collectionobject.lifesci.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.collectionobject.lifesci.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -142,14 +156,14 @@
     <target name="dist"
     	description="generate distribution for collectionobject doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.collectionobject.lifesci.legacy.jar}"/>
         </copy>
     </target>
 
     <target name="dist_installer"
     	description="Creates an installer distribution for CollectionObject doctype" depends="package">
         <copy todir="${services.trunk}/${dist.installer.services}/collectionobject/nuxeo">
-            <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.collectionobject.lifesci.legacy.jar}"/>
         </copy>
     </target>
 </project>
diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
index fd2d3cf11..00654c46e 100644
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
@@ -11,10 +11,12 @@
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
     <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <!-- Note: the names of these JAR files include the string 'vocabularyitem', while -->
+    <!-- the names of of the legacy JAR files, below, include the string 'vocabulary'. -->
     <property name="nuxeo.vocabulary.doctype.jars.all"
-        value="collectionspace.vocabulary.doctype*.jar"/>
+        value="collectionspace.vocabularyitem.doctype*.jar"/>
     <property name="nuxeo.vocabulary.schema.common.jars.all"
-        value="collectionspace.vocabulary.schema*_common.jar"/>
+        value="collectionspace.vocabularyitem.schema*_common.jar"/>
     <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
     <property name="nuxeo.vocabulary.legacy.jars.all"
         value="org.collectionspace.services.vocabulary.3rdparty.nuxeo-*.jar"/>
-- 
2.47.3