CSPACE-6142: Update ant undeploy target for the person/3rdparty/nuxeo-platform-person...

diff --git a/services/person/3rdparty/nuxeo-platform-person-lifesci/build.xml b/services/person/3rdparty/nuxeo-platform-person-lifesci/build.xml
index 7bad8c9a7b18fd374c1652e3177139e8bbc38a86..a3c1ff19b2291b3fe19368f62d808c8948baa2bb 100644 (file)
--- a/services/person/3rdparty/nuxeo-platform-person-lifesci/build.xml
+++ b/services/person/3rdparty/nuxeo-platform-person-lifesci/build.xml
@@ -12,10 +12,16 @@
     <property name="src" location="src"/>
     <property name="build" location="build"/>
     <property name="dist"  location="dist"/>
-    <property name="nuxeo.person.jar"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <!-- Doctype JAR(s) are removed via the 'undeploy' target in the -->
+    <!-- Ant buildfile for the common schema -->
+    <property name="nuxeo.person.schema.naturalhistory.jars.all"
+        value="collectionspace.person.schema*_naturalhistory.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier -->
+    <property name="nuxeo.person.lifesci.legacy.jars.all"
+        value="org.collectionspace.services.person.3rdparty.lifesci.nuxeo-*.jar"/>
+    <property name="nuxeo.person.lifesci.legacy.jar"
         value="org.collectionspace.services.person.3rdparty.lifesci.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.person.jars.all"
-        value="org.collectionspace.services.person.3rdparty.*.nuxeo-*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -118,15 +124,31 @@
 
     <target name="deploy" depends="install"
         description="deploy person doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.person.jar}"
-        todir="${jee.deploy.nuxeo.plugins}"/>
+        <!-- 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.person.lifesci.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy person 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.person.jars.all}"/>
+                <include name="${nuxeo.person.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.person.lifesci.legacy.jars.all}"/>
+            </fileset>
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.person.lifesci.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>