CSPACE-6142: When undeploying current and legacy Nuxeo doctype JARs, account for...

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
index 9c5e38dd98406f99a7b390b7105f5625390c5f05..c85a19c9ff27cb9aee9c0b9aa872aa93d209581d 100644 (file)
--- 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"/>\r
     <property name="dist"  location="dist"/>\r
     <!-- JAR files used by CollectionSpace 4.0 and later -->\r
-    <property name="nuxeo.collectionobject.doctype.jars.all"\r
-        value="collectionspace.collectionobject.doctype*.jar"/>\r
+    <!-- Doctype JAR(s) are removed via the 'undeploy' target in the -->\r
+    <!-- Ant buildfile for the common schema -->\r
     <property name="nuxeo.collectionobject.schema.naturalhistory.jars.all"\r
         value="collectionspace.collectionobject.schema*_naturalhistory.jar"/>\r
     <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> \r
-    <property name="nuxeo.collectionobject.legacy.jars.all"\r
-        value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-*.jar"/>\r
-    <property name="nuxeo.collectionobject.jar"\r
+    <!-- Additional legacy JAR(s) are removed via the 'undeploy' target in the -->\r
+    <!-- Ant buildfile for the common schema -->\r
+    <property name="nuxeo.collectionobject.lifesci.legacy.jars.all"\r
+        value="org.collectionspace.services.collectionobject.3rdparty.lifesci.nuxeo-*.jar"/>\r
+    <property name="nuxeo.collectionobject.lifesci.legacy.jar"\r
         value="org.collectionspace.services.collectionobject.3rdparty.lifesci.nuxeo-${cspace.release}.jar"/>\r
     \r
     <condition property="osfamily-unix">\r
@@ -126,15 +128,27 @@
         description="deploy collectionobject doctype in ${jee.server.nuxeo}">\r
         <!-- This target is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool\r
         leaving this only for backwards compatibility reasons. -->  \r
-        <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"\r
+        <copy file="${basedir}/target/${nuxeo.collectionobject.lifesci.legacy.jar}"\r
             todir="${jee.deploy.nuxeo.plugins}"/>\r
     </target>\r
 \r
     <target name="undeploy"\r
         description="undeploy collectionobject doctype from ${jee.server.nuxeo}">\r
         <delete>\r
+            <!-- Doctype JAR(s) are removed via the 'undeploy' Ant target in the -->\r
+            <!-- buildfile for the common schema -->\r
             <fileset dir="${jee.deploy.nuxeo.plugins}">\r
-                <include name="${nuxeo.collectionobject.jars.all}"/>\r
+                <include name="${nuxeo.collectionobject.schema.naturalhistory.jars.all}"/>\r
+            </fileset>\r
+            <!-- Undeploy legacy artifacts -->\r
+            <!-- Additional legacy JAR(s) are removed via the 'undeploy' target in the -->\r
+            <!-- Ant buildfile for the common schema -->\r
+            <fileset dir="${jee.deploy.nuxeo.plugins}">\r
+                <include name="${nuxeo.collectionobject.lifesci.legacy.jars.all}"/>\r
+            </fileset>\r
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->\r
+            <fileset dir="${jee.deploy.nuxeo.system}">\r
+                <include name="${nuxeo.collectionobject.lifesci.legacy.jars.all}"/>\r
             </fileset>\r
         </delete>\r
     </target>\r
@@ -142,14 +156,14 @@
     <target name="dist"\r
        description="generate distribution for collectionobject doctype" depends="package">\r
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">\r
-            <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>\r
+            <fileset file="${basedir}/target/${nuxeo.collectionobject.lifesci.legacy.jar}"/>\r
         </copy>\r
     </target>\r
 \r
     <target name="dist_installer"\r
        description="Creates an installer distribution for CollectionObject doctype" depends="package">\r
         <copy todir="${services.trunk}/${dist.installer.services}/collectionobject/nuxeo">\r
-            <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>\r
+            <fileset file="${basedir}/target/${nuxeo.collectionobject.lifesci.legacy.jar}"/>\r
         </copy>\r
     </target>\r
 </project>\r

diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
index fd2d3cf11f3dcd2dd08e84f9eaa5896da6641417..00654c46ed7ee78bf56df232894e3535f8a73151 100644 (file)
--- 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"/>