From 9e8ad15a90bf3f132c084eb3b2f2ac35448223e0 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Mon, 12 Aug 2013 18:53:06 -0700
Subject: [PATCH] CSPACE-6142: Undeploy new-style Nuxeo doctype and schema
 JARs, along with legacy JARs, via 'ant undeploy'. Reflect that some new
 artifacts are schema-specific, as reflected in their filenames.

---
 .../nuxeo-platform-cs-acquisition/build.xml   | 36 +++++++++++++----
 .../3rdparty/nuxeo-platform-cs-blob/build.xml | 36 +++++++++++++----
 .../nuxeo-platform-cs-citation/build.xml      | 38 +++++++++++++-----
 .../build.xml                                 | 18 ++++++---
 .../build.xml                                 | 38 +++++++++++++-----
 .../nuxeo-platform-cs-concept/build.xml       | 38 +++++++++++++-----
 .../nuxeo-platform-cs-contact/build.xml       | 36 +++++++++++++----
 .../nuxeo-platform-cs-group/build.xml         | 36 +++++++++++++----
 .../nuxeo-platform-cs-intake/build.xml        | 36 +++++++++++++----
 .../nuxeo-platform-cs-loanin/build.xml        | 37 +++++++++++++----
 .../nuxeo-platform-cs-loanout/build.xml       | 36 +++++++++++++----
 .../nuxeo-platform-cs-location/build.xml      | 38 +++++++++++++-----
 .../nuxeo-platform-cs-media/build.xml         | 38 +++++++++++++-----
 .../nuxeo-platform-cs-movement/build.xml      | 36 +++++++++++++----
 .../nuxeo-platform-cs-objectexit/build.xml    | 36 +++++++++++++----
 .../nuxeo-platform-cs-organization/build.xml  | 38 +++++++++++++-----
 .../nuxeo-platform-cs-person/build.xml        | 38 +++++++++++++-----
 .../nuxeo-platform-cs-place/build.xml         | 38 +++++++++++++-----
 .../nuxeo-platform-cs-report/build.xml        | 36 +++++++++++++----
 .../nuxeo-platform-cs-taxonomy/build.xml      | 40 ++++++++++++++-----
 .../nuxeo-platform-cs-vocabulary/build.xml    | 38 +++++++++++++-----
 .../3rdparty/nuxeo-platform-cs-work/build.xml | 19 ++++-----
 22 files changed, 594 insertions(+), 186 deletions(-)

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
index de608a466..8cc890bb5 100644
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-acquisition" default="package" basedir=".">
     <description>
         acquisition nuxeo document type
@@ -10,10 +10,16 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.acquisition.jar"
-        value="org.collectionspace.services.acquisition.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.acquisition.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.acquisition.doctype.jars.all"
+        value="collectionspace.acquisition.doctype*.jar"/>
+    <property name="nuxeo.acquisition.schema.common.jars.all"
+        value="collectionspace.acquisition.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.acquisition.legacy.jars.all"
         value="org.collectionspace.services.acquisition.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.acquisition.legacy.jar"
+        value="org.collectionspace.services.acquisition.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,15 +120,29 @@
 
     <target name="deploy" depends="install"
         description="deploy acquisition doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.acquisition.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.acquisition.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy acquisition doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.acquisition.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.acquisition.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.acquisition.jars.all}"/>
+                <include name="${nuxeo.acquisition.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.acquisition.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -130,7 +150,7 @@
     <target name="dist"
         description="generate distribution for acquisition doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.acquisition.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.acquisition.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml b/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml
index eb3f34a5e..5f5d2b5da 100644
--- a/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml
+++ b/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-blob" default="package" basedir=".">
     <description>
         blob nuxeo document type
@@ -10,10 +10,16 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.blob.jar"
-        value="org.collectionspace.services.blob.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.blob.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.blob.doctype.jars.all"
+        value="collectionspace.blob.doctype*.jar"/>
+    <property name="nuxeo.blob.schema.common.jars.all"
+        value="collectionspace.blob.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.blob.legacy.jars.all"
         value="org.collectionspace.services.blob.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.blob.legacy.jar"
+        value="org.collectionspace.services.blob.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,15 +120,29 @@
 
     <target name="deploy" depends="install"
         description="deploy blob doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.blob.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.blob.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy blob doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.blob.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.blob.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.blob.jars.all}"/>
+                <include name="${nuxeo.blob.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.blob.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -131,7 +151,7 @@
     <target name="dist"
         description="generate distribution for blob doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.blob.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.blob.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml b/services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml
index 6d793b26d..19fee4a31 100644
--- a/services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml
+++ b/services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-citation" default="package" basedir=".">
     <description>
         citation nuxeo document type
@@ -10,10 +10,16 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.citation.jar"
-        value="org.collectionspace.services.citation.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.citation.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.citation.doctype.jars.all"
+        value="collectionspace.citation.doctype*.jar"/>
+    <property name="nuxeo.citation.schema.common.jars.all"
+        value="collectionspace.citation.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.citation.legacy.jars.all"
         value="org.collectionspace.services.citation.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.citation.legacy.jar"
+        value="org.collectionspace.services.citation.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,15 +120,29 @@
 
     <target name="deploy" depends="install"
         description="deploy citation doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.citation.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.citation.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy citation doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.citation.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.citation.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.citation.jars.all}"/>
+                <include name="${nuxeo.citation.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.citation.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -130,14 +150,14 @@
     <target name="dist"
         description="generate distribution for citation doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.citation.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.citation.legacy.jar}"/>
         </copy>
     </target>
 
     <target name="dist_installer"
     	description="Creates an installer distribution for citation doctype" depends="package">
         <copy todir="${services.trunk}/${dist.installer.services}/citation/nuxeo">
-            <fileset file="${basedir}/target/${nuxeo.citation.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.citation.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
index 5180b1769..9c5e38dd9 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-collectionobject-lifesci" default="package" basedir=".">
     <description>
         Collectionobject nuxeo document type for the lifesci tenant
@@ -12,11 +12,17 @@
     <property name="src" location="src"/>
     <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"/>
+    <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"
         value="org.collectionspace.services.collectionobject.3rdparty.lifesci.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.collectionobject.jars.all"
-        value="org.collectionspace.services.collectionobject.3rdparty.*.nuxeo-*.jar"/>
-
+    
     <condition property="osfamily-unix">
         <os family="unix" />
     </condition>
@@ -118,8 +124,10 @@
 
     <target name="deploy" depends="install"
         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}"
-        todir="${jee.deploy.nuxeo.plugins}"/>
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
index 52268b1dd..b8bbd3849 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-collectionobjects_common" default="package" basedir=".">
     <description>
         CollectionobjectsCommon Nuxeo document type
@@ -12,10 +12,16 @@
     <property name="src" location="src"/>
     <property name="build" location="build"/>
     <property name="dist"  location="dist"/>
-    <property name="nuxeo.collectionobject.jar"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.collectionobject.doctype.jars.all"
+        value="collectionspace.collectionobject.doctype*.jar"/>
+    <property name="nuxeo.collectionobject.schema.common.jars.all"
+        value="collectionspace.collectionobject.schema*_common.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.legacy.jar"
         value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.collectionobject.jars.all"
-        value="org.collectionspace.services.collectionobject.*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -118,15 +124,29 @@
 
     <target name="deploy" depends="install"
         description="Deploy CollectionObjectsCommon doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.collectionobject.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.collectionobject.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="Undeploy CollectionObjectsCommon doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.collectionobject.doctype.jars.all}"/>
+            </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.collectionobject.jars.all}"/>
+                <include name="${nuxeo.collectionobject.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.collectionobject.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.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -134,14 +154,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.legacy.jar}"/>
         </copy>
     </target>
 
     <target name="dist_installer"
     	description="Creates an installer distribution for CollectionObjectsCommon 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.legacy.jar}"/>
         </copy>
     </target>
 </project>
diff --git a/services/concept/3rdparty/nuxeo-platform-cs-concept/build.xml b/services/concept/3rdparty/nuxeo-platform-cs-concept/build.xml
index 9a6440301..a49c5cc13 100644
--- a/services/concept/3rdparty/nuxeo-platform-cs-concept/build.xml
+++ b/services/concept/3rdparty/nuxeo-platform-cs-concept/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-concept" default="package" basedir=".">
     <description>
         concept nuxeo document type
@@ -10,10 +10,16 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.concept.jar"
-        value="org.collectionspace.services.concept.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.concept.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.concept.doctype.jars.all"
+        value="collectionspace.concept.doctype*.jar"/>
+    <property name="nuxeo.concept.schema.common.jars.all"
+        value="collectionspace.concept.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.concept.legacy.jars.all"
         value="org.collectionspace.services.concept.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.concept.legacy.jar"
+        value="org.collectionspace.services.concept.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,15 +120,29 @@
 
     <target name="deploy" depends="install"
         description="deploy concept doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.concept.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.concept.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy concept doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.concept.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.concept.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.concept.jars.all}"/>
+                <include name="${nuxeo.concept.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.concept.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -130,14 +150,14 @@
     <target name="dist"
         description="generate distribution for concept doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.concept.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.concept.legacy.jar}"/>
         </copy>
     </target>
 
     <target name="dist_installer"
     	description="Creates an installer distribution for concept doctype" depends="package">
         <copy todir="${services.trunk}/${dist.installer.services}/concept/nuxeo">
-            <fileset file="${basedir}/target/${nuxeo.concept.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.concept.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
index dade300f9..574f331ba 100644
--- a/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
+++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-contact" default="package" basedir=".">
     <description>
         contact nuxeo document type
@@ -12,10 +12,16 @@
     <property name="src" location="src"/>
     <property name="build" location="build"/>
     <property name="dist"  location="dist"/>
-    <property name="nuxeo.contact.jar"
-        value="org.collectionspace.services.contact.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.contact.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.contact.doctype.jars.all"
+        value="collectionspace.contact.doctype*.jar"/>
+    <property name="nuxeo.contact.schema.common.jars.all"
+        value="collectionspace.contact.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.contact.legacy.jars.all"
         value="org.collectionspace.services.contact.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.contact.legacy.jar"
+        value="org.collectionspace.services.contact.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -116,15 +122,29 @@
 
     <target name="deploy" depends="install"
         description="deploy contact doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.contact.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.contact.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy contact doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.contact.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.contact.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.contact.jars.all}"/>
+                <include name="${nuxeo.contact.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.contact.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -132,7 +152,7 @@
     <target name="dist"
         description="generate distribution for contact doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.contact.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.contact.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/build.xml b/services/group/3rdparty/nuxeo-platform-cs-group/build.xml
index 8e8e7c7bf..0c4af8cd2 100644
--- a/services/group/3rdparty/nuxeo-platform-cs-group/build.xml
+++ b/services/group/3rdparty/nuxeo-platform-cs-group/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-group" default="package" basedir=".">
     <description>
         group nuxeo document type
@@ -10,10 +10,16 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.group.jar"
-        value="org.collectionspace.services.group.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.group.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.group.doctype.jars.all"
+        value="collectionspace.group.doctype*.jar"/>
+    <property name="nuxeo.group.schema.common.jars.all"
+        value="collectionspace.group.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.group.legacy.jars.all"
         value="org.collectionspace.services.group.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.group.legacy.jar"
+        value="org.collectionspace.services.group.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,15 +120,29 @@
 
     <target name="deploy" depends="install"
         description="deploy group doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.group.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.group.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy group doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.group.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.group.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.group.jars.all}"/>
+                <include name="${nuxeo.group.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.group.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -131,7 +151,7 @@
     <target name="dist"
         description="generate distribution for group doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.group.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.group.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
index bfc32221d..7676d6156 100644
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-intake" default="package" basedir=".">
     <description>
         intake nuxeo document type
@@ -10,10 +10,16 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.intake.jar"
-        value="org.collectionspace.services.intake.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.intake.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.intake.doctype.jars.all"
+        value="collectionspace.intake.doctype*.jar"/>
+    <property name="nuxeo.intake.schema.common.jars.all"
+        value="collectionspace.intake.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.intake.legacy.jars.all"
         value="org.collectionspace.services.intake.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.intake.legacy.jar"
+        value="org.collectionspace.services.intake.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,15 +120,29 @@
 
     <target name="deploy" depends="install"
         description="deploy intake doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.intake.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.intake.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy intake doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.intake.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.intake.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.intake.jars.all}"/>
+                <include name="${nuxeo.intake.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.intake.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -130,7 +150,7 @@
     <target name="dist"
         description="generate distribution for intake doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.intake.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.intake.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
index 780a13b48..4e9ffaa78 100644
--- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
+++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-loanin" default="package" basedir=".">
     <description>
         loanin nuxeo document type
@@ -10,10 +10,17 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.loanin.jar"
-        value="org.collectionspace.services.loanin.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.loanin.jars.all"
+    
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.loanin.doctype.jars.all"
+        value="collectionspace.loanin.doctype*.jar"/>
+    <property name="nuxeo.loanin.schema.common.jars.all"
+        value="collectionspace.loanin.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.loanin.legacy.jars.all"
         value="org.collectionspace.services.loanin.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.loanin.legacy.jar"
+        value="org.collectionspace.services.loanin.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,15 +121,29 @@
 
     <target name="deploy" depends="install"
         description="deploy loanin doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.loanin.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.loanin.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy loanin doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.loanin.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.loanin.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.loanin.jars.all}"/>
+                <include name="${nuxeo.loanin.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.loanin.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -130,7 +151,7 @@
     <target name="dist"
         description="generate distribution for loanin doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.loanin.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.loanin.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
index 3ef1f46c3..1ef7df008 100644
--- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
+++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-loanout" default="package" basedir=".">
     <description>
         loanout nuxeo document type
@@ -10,10 +10,16 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.loanout.jar"
-        value="org.collectionspace.services.loanout.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.loanout.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.loanout.doctype.jars.all"
+        value="collectionspace.loanout.doctype*.jar"/>
+    <property name="nuxeo.loanout.schema.common.jars.all"
+        value="collectionspace.loanout.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.loanout.legacy.jars.all"
         value="org.collectionspace.services.loanout.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.loanout.legacy.jar"
+        value="org.collectionspace.services.loanout.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,15 +120,29 @@
 
     <target name="deploy" depends="install"
         description="deploy loanout doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.loanout.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.loanout.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy loanout doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.loanout.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.loanout.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.loanout.jars.all}"/>
+                <include name="${nuxeo.loanout.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.loanout.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -131,7 +151,7 @@
     <target name="dist"
         description="generate distribution for loanout doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.loanout.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.loanout.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/build.xml b/services/location/3rdparty/nuxeo-platform-cs-location/build.xml
index 72d27426e..8818f707d 100644
--- a/services/location/3rdparty/nuxeo-platform-cs-location/build.xml
+++ b/services/location/3rdparty/nuxeo-platform-cs-location/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-location" default="package" basedir=".">
     <description>
         location nuxeo document type
@@ -10,10 +10,16 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.location.jar"
-        value="org.collectionspace.services.location.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.location.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.location.doctype.jars.all"
+        value="collectionspace.location.doctype*.jar"/>
+    <property name="nuxeo.location.schema.common.jars.all"
+        value="collectionspace.location.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.location.legacy.jars.all"
         value="org.collectionspace.services.location.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.location.legacy.jar"
+        value="org.collectionspace.services.location.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,15 +120,29 @@
 
     <target name="deploy" depends="install"
         description="deploy location doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.location.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.location.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy location doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.location.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.location.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.location.jars.all}"/>
+                <include name="${nuxeo.location.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.location.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -130,14 +150,14 @@
     <target name="dist"
         description="generate distribution for location doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.location.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.location.legacy.jar}"/>
         </copy>
     </target>
 
     <target name="dist_installer"
     	description="Creates an installer distribution for location doctype" depends="package">
         <copy todir="${services.trunk}/${dist.installer.services}/location/nuxeo">
-            <fileset file="${basedir}/target/${nuxeo.location.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.location.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/media/3rdparty/nuxeo-platform-cs-media/build.xml b/services/media/3rdparty/nuxeo-platform-cs-media/build.xml
index 3691df6ad..745b97b15 100644
--- a/services/media/3rdparty/nuxeo-platform-cs-media/build.xml
+++ b/services/media/3rdparty/nuxeo-platform-cs-media/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-media" default="package" basedir=".">
     <description>
         media nuxeo document type
@@ -10,11 +10,17 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.media.jar"
-        value="org.collectionspace.services.media.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.media.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.media.doctype.jars.all"
+        value="collectionspace.media.doctype*.jar"/>
+    <property name="nuxeo.media.schema.common.jars.all"
+        value="collectionspace.media.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.media.legacy.jars.all"
         value="org.collectionspace.services.media.3rdparty.nuxeo-*.jar"/>
-
+    <property name="nuxeo.media.legacy.jar"
+        value="org.collectionspace.services.media.3rdparty.nuxeo-${cspace.release}.jar"/>
+    
     <condition property="osfamily-unix">
         <os family="unix" />
     </condition>
@@ -114,15 +120,29 @@
 
     <target name="deploy" depends="install"
         description="deploy media doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.media.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.media.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy media doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.media.jars.all}"/>
+                <include name="${nuxeo.media.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.media.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.media.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.media.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -131,7 +151,7 @@
     <target name="dist"
         description="generate distribution for media doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.media.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.media.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml b/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml
index 3aca54349..8e0a404c3 100644
--- a/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml
+++ b/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-movement" default="package" basedir=".">
     <description>
         movement nuxeo document type
@@ -10,10 +10,16 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.movement.jar"
-        value="org.collectionspace.services.movement.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.movement.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.movement.doctype.jars.all"
+        value="collectionspace.movement.doctype*.jar"/>
+    <property name="nuxeo.movement.schema.common.jars.all"
+        value="collectionspace.movement.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.movement.legacy.jars.all"
         value="org.collectionspace.services.movement.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.movement.legacy.jar"
+        value="org.collectionspace.services.movement.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,15 +120,29 @@
 
     <target name="deploy" depends="install"
         description="deploy movement doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.movement.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.movement.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy movement doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.movement.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.movement.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.movement.jars.all}"/>
+                <include name="${nuxeo.movement.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.movement.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -131,7 +151,7 @@
     <target name="dist"
         description="generate distribution for movement doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.movement.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.movement.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml
index 2dec153c4..a9fa6b0d1 100644
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml
+++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-objectexit" default="package" basedir=".">
     <description>
         objectexit nuxeo document type
@@ -10,10 +10,16 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.objectexit.jar"
-        value="org.collectionspace.services.objectexit.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.objectexit.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.objectexit.doctype.jars.all"
+        value="collectionspace.objectexit.doctype*.jar"/>
+    <property name="nuxeo.objectexit.schema.common.jars.all"
+        value="collectionspace.objectexit.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.objectexit.legacy.jars.all"
         value="org.collectionspace.services.objectexit.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.objectexit.legacy.jar"
+        value="org.collectionspace.services.objectexit.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,15 +120,29 @@
 
     <target name="deploy" depends="install"
         description="deploy objectexit doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.objectexit.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.objectexit.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy objectexit doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.objectexit.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.objectexit.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.objectexit.jars.all}"/>
+                <include name="${nuxeo.objectexit.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.objectexit.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -131,7 +151,7 @@
     <target name="dist"
         description="generate distribution for objectexit doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.objectexit.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.objectexit.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
index b1cbce2e9..e999a19a4 100644
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-organization" default="package" basedir=".">
     <description>
         organization nuxeo document type
@@ -10,10 +10,16 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.organization.jar"
-        value="org.collectionspace.services.organization.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.organization.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.organization.doctype.jars.all"
+        value="collectionspace.organization.doctype*.jar"/>
+    <property name="nuxeo.organization.schema.common.jars.all"
+        value="collectionspace.organization.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.organization.legacy.jars.all"
         value="org.collectionspace.services.organization.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.organization.legacy.jar"
+        value="org.collectionspace.services.organization.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,15 +120,29 @@
 
     <target name="deploy" depends="install"
         description="deploy organization doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.organization.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.organization.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy organization doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.organization.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.organization.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.organization.jars.all}"/>
+                <include name="${nuxeo.organization.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.organization.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -130,14 +150,14 @@
     <target name="dist"
         description="generate distribution for organization doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.organization.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.organization.legacy.jar}"/>
         </copy>
     </target>
 
     <target name="dist_installer"
     	description="Creates an installer distribution for organization doctype" depends="package">
         <copy todir="${services.trunk}/${dist.installer.services}/organization/nuxeo">
-            <fileset file="${basedir}/target/${nuxeo.organization.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.organization.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/build.xml b/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
index 2cb87bccf..0be228b4c 100644
--- a/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-person" default="package" basedir=".">
     <description>
         person nuxeo document type
@@ -10,10 +10,16 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.person.jar"
-        value="org.collectionspace.services.person.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.person.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.person.doctype.jars.all"
+        value="collectionspace.person.doctype*.jar"/>
+    <property name="nuxeo.person.schema.common.jars.all"
+        value="collectionspace.person.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.person.legacy.jars.all"
         value="org.collectionspace.services.person.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.person.legacy.jar"
+        value="org.collectionspace.services.person.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,15 +120,29 @@
 
     <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.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy person doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.person.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.person.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.person.jars.all}"/>
+                <include name="${nuxeo.person.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.person.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -130,14 +150,14 @@
     <target name="dist"
         description="generate distribution for person doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.person.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.person.legacy.jar}"/>
         </copy>
     </target>
 
     <target name="dist_installer"
     	description="Creates an installer distribution for person doctype" depends="package">
         <copy todir="${services.trunk}/${dist.installer.services}/person/nuxeo">
-            <fileset file="${basedir}/target/${nuxeo.person.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.person.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/place/3rdparty/nuxeo-platform-cs-place/build.xml b/services/place/3rdparty/nuxeo-platform-cs-place/build.xml
index ceb54d64e..54f7d28bd 100644
--- a/services/place/3rdparty/nuxeo-platform-cs-place/build.xml
+++ b/services/place/3rdparty/nuxeo-platform-cs-place/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-place" default="package" basedir=".">
     <description>
         place nuxeo document type
@@ -10,10 +10,16 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.place.jar"
-        value="org.collectionspace.services.place.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.place.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.place.doctype.jars.all"
+        value="collectionspace.place.doctype*.jar"/>
+    <property name="nuxeo.place.schema.common.jars.all"
+        value="collectionspace.place.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.place.legacy.jars.all"
         value="org.collectionspace.services.place.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.place.legacy.jar"
+        value="org.collectionspace.services.place.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,19 +120,29 @@
 
     <target name="deploy" depends="install"
         description="deploy place doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.place.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.place.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy place doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.place.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.place.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.place.jars.all}"/>
+                <include name="${nuxeo.place.legacy.jars.all}"/>
             </fileset>
-            <!-- Legacy deployment location through release 0.6 -->
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
             <fileset dir="${jee.deploy.nuxeo.system}">
-                <include name="${nuxeo.place.jars.all}"/>
+                <include name="${nuxeo.place.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -134,14 +150,14 @@
     <target name="dist"
         description="generate distribution for place doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.place.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.place.legacy.jar}"/>
         </copy>
     </target>
 
     <target name="dist_installer"
     	description="Creates an installer distribution for place doctype" depends="package">
         <copy todir="${services.trunk}/${dist.installer.services}/place/nuxeo">
-            <fileset file="${basedir}/target/${nuxeo.place.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.place.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/report/3rdparty/nuxeo-platform-cs-report/build.xml b/services/report/3rdparty/nuxeo-platform-cs-report/build.xml
index 20b49530a..fac250cfc 100644
--- a/services/report/3rdparty/nuxeo-platform-cs-report/build.xml
+++ b/services/report/3rdparty/nuxeo-platform-cs-report/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-report" default="package" basedir=".">
     <description>
         report nuxeo document type
@@ -10,10 +10,16 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.report.jar"
-        value="org.collectionspace.services.report.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.report.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.report.doctype.jars.all"
+        value="collectionspace.report.doctype*.jar"/>
+    <property name="nuxeo.report.schema.common.jars.all"
+        value="collectionspace.report.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.report.legacy.jars.all"
         value="org.collectionspace.services.report.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.report.legacy.jar"
+        value="org.collectionspace.services.report.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,15 +120,29 @@
 
     <target name="deploy" depends="install"
         description="deploy report doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.report.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.report.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy report doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.report.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.report.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.report.jars.all}"/>
+                <include name="${nuxeo.report.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.report.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -130,7 +150,7 @@
     <target name="dist"
         description="generate distribution for report doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.report.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.report.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml
index 47dfd9e4b..9950070e6 100644
--- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml
+++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-taxonomy" default="package" basedir=".">
     <description>
         taxonomy nuxeo document type
@@ -10,10 +10,18 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.taxonomy.jar"
-        value="org.collectionspace.services.taxonomy.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.taxonomy.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <!-- Note: the names of these JAR files include the string 'taxon', while -->
+    <!-- the names of of the legacy JAR files, below, include the string 'taxonomy'. -->
+    <property name="nuxeo.taxonomy.doctype.jars.all"
+        value="collectionspace.taxon.doctype*.jar"/>
+    <property name="nuxeo.taxonomy.schema.common.jars.all"
+        value="collectionspace.taxon.schema*_common.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.taxonomy.legacy.jars.all"
         value="org.collectionspace.services.taxonomy.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.taxonomy.legacy.jar"
+        value="org.collectionspace.services.taxonomy.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,15 +122,29 @@
 
     <target name="deploy" depends="install"
         description="deploy taxonomy doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.taxonomy.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.taxonomy.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy taxonomy doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.taxonomy.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.taxonomy.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.taxonomy.jars.all}"/>
+                <include name="${nuxeo.taxonomy.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.taxonomy.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -130,14 +152,14 @@
     <target name="dist"
         description="generate distribution for taxonomy doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.taxonomy.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.taxonomy.legacy.jar}"/>
         </copy>
     </target>
 
     <target name="dist_installer"
     	description="Creates an installer distribution for taxonomy doctype" depends="package">
         <copy todir="${services.trunk}/${dist.installer.services}/taxonomy/nuxeo">
-            <fileset file="${basedir}/target/${nuxeo.taxonomy.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.taxonomy.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
index bc5d5416d..fd2d3cf11 100644
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-vocabulary" default="package" basedir=".">
     <description>
         vocabulary nuxeo document type
@@ -10,10 +10,16 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.vocabulary.jar"
-        value="org.collectionspace.services.vocabulary.3rdparty.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.vocabulary.jars.all"
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.vocabulary.doctype.jars.all"
+        value="collectionspace.vocabulary.doctype*.jar"/>
+    <property name="nuxeo.vocabulary.schema.common.jars.all"
+        value="collectionspace.vocabulary.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"/>
+    <property name="nuxeo.vocabulary.legacy.jar"
+        value="org.collectionspace.services.vocabulary.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -114,15 +120,29 @@
 
     <target name="deploy" depends="install"
         description="deploy vocabulary doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.vocabulary.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.vocabulary.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy vocabulary doctype from ${jee.server.nuxeo}">
         <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.vocabulary.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.vocabulary.schema.common.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.vocabulary.jars.all}"/>
+                <include name="${nuxeo.vocabulary.legacy.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.vocabulary.legacy.jars.all}"/>
             </fileset>
         </delete>
     </target>
@@ -130,14 +150,14 @@
     <target name="dist"
         description="generate distribution for vocabulary doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.vocabulary.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.vocabulary.legacy.jar}"/>
         </copy>
     </target>
 
     <target name="dist_installer"
     	description="Creates an installer distribution for Vocabulary doctype" depends="package">
         <copy todir="${services.trunk}/${dist.installer.services}/vocabulary/nuxeo">
-            <fileset file="${basedir}/target/${nuxeo.vocabulary.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.vocabulary.legacy.jar}"/>
         </copy>
     </target>
 
diff --git a/services/work/3rdparty/nuxeo-platform-cs-work/build.xml b/services/work/3rdparty/nuxeo-platform-cs-work/build.xml
index 58bdadb07..43cf9aac0 100644
--- a/services/work/3rdparty/nuxeo-platform-cs-work/build.xml
+++ b/services/work/3rdparty/nuxeo-platform-cs-work/build.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="nuxeo-platform-cs-work" default="package" basedir=".">
     <description>
         work nuxeo document type
@@ -9,16 +10,16 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
-    <property name="nuxeo.work.jar"
-        value="org.collectionspace.services.work.3rdparty.nuxeo-${cspace.release}.jar"/>
     <!-- JAR files used by CollectionSpace 4.0 and later -->
     <property name="nuxeo.work.doctype.jars.all"
-        value="collectionspace.work.*doctype*.jar"/>
-    <property name="nuxeo.work.schema.jars.all"
-        value="collectionspace.work.*schema*.jar"/>
+        value="collectionspace.work.doctype*.jar"/>
+    <property name="nuxeo.work.schema.common.jars.all"
+        value="collectionspace.work.schema*_common.jar"/>
     <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
     <property name="nuxeo.work.legacy.jars.all"
         value="org.collectionspace.services.work.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.work.legacy.jar"
+        value="org.collectionspace.services.work.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -121,7 +122,7 @@
         description="deploy work 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.work.jar}"
+        <copy file="${basedir}/target/${nuxeo.work.legacy.jar}"
             todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
@@ -133,7 +134,7 @@
                 <include name="${nuxeo.work.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.work.schema.jars.all}"/>
+                <include name="${nuxeo.work.schema.common.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
@@ -149,14 +150,14 @@
     <target name="dist"
         description="generate distribution for work doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.work.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.work.legacy.jar}"/>
         </copy>
     </target>
 
     <target name="dist_installer"
         description="Creates an installer distribution for work doctype" depends="package">
         <copy todir="${services.trunk}/${dist.installer.services}/work/nuxeo">
-            <fileset file="${basedir}/target/${nuxeo.work.jar}"/>
+            <fileset file="${basedir}/target/${nuxeo.work.legacy.jar}"/>
         </copy>
     </target>
 
-- 
2.47.3