From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 6 Sep 2013 00:53:33 +0000 (-0700)
Subject: CSPACE-6178: Clean up all new-style (unified config) schema JAR files from /usr/local... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=14bfb98a7c87e4a1cb01038fa68fac5aee3e10db;p=tmp%2Fjakarta-migration.git

CSPACE-6178: Clean up all new-style (unified config) schema JAR files from /usr/local/share/apache-tomcat-6.0.33/nuxeo-server/plugins, not just schema JAR files for common schemas and any out-of-the-box extension schemas.
---

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
index 0196c2a2a..bfe1fc42f 100644
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
@@ -12,9 +12,9 @@
     <property name="src" location="src"/>
     <!-- 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"/>
+        value="collectionspace.acquisition.doctype.*.jar"/>
+    <property name="nuxeo.acquisition.schema.jars.all"
+        value="collectionspace.acquisition.schema.*.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"/>
@@ -134,7 +134,7 @@
                 <include name="${nuxeo.acquisition.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.acquisition.schema.common.jars.all}"/>
+                <include name="${nuxeo.acquisition.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml b/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml
index 17fde560d..69844ad34 100644
--- a/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml
+++ b/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml
@@ -12,9 +12,9 @@
     <property name="src" location="src"/>
     <!-- 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"/>
+        value="collectionspace.blob.doctype.*.jar"/>
+    <property name="nuxeo.blob.schema.jars.all"
+        value="collectionspace.blob.schema.*.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"/>
@@ -134,7 +134,7 @@
                 <include name="${nuxeo.blob.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.blob.schema.common.jars.all}"/>
+                <include name="${nuxeo.blob.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml b/services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml
index dbdbd2ea3..ba27f22fb 100644
--- a/services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml
+++ b/services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml
@@ -12,9 +12,9 @@
     <property name="src" location="src"/>
     <!-- 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"/>
+        value="collectionspace.citation.doctype.*.jar"/>
+    <property name="nuxeo.citation.schema.jars.all"
+        value="collectionspace.citation.schema.*.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"/>
@@ -134,7 +134,7 @@
                 <include name="${nuxeo.citation.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.citation.schema.common.jars.all}"/>
+                <include name="${nuxeo.citation.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
index 24248f586..639c3b797 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
@@ -13,10 +13,8 @@
     <property name="build" location="build"/>
     <property name="dist"  location="dist"/>
     <!-- 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.collectionobject.schema.naturalhistory.jars.all"
-        value="collectionspace.collectionobject.schema*_naturalhistory.jar"/>
+    <!-- Both doctype and schema JAR(s) are removed via the 'undeploy' target -->
+    <!-- in another Ant buildfile, in a peer module to this module -->
     <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
     <!-- Additional legacy JAR(s) are removed via the 'undeploy' target in the -->
     <!-- Ant buildfile for the common schema -->
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
index 9bdc786cf..53409adae 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
@@ -14,9 +14,9 @@
     <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.common.jars.all"
-        value="collectionspace.collectionobject.schema*_common.jar"/>
+        value="collectionspace.collectionobject.doctype.*.jar"/>
+    <property name="nuxeo.collectionobject.schema.jars.all"
+        value="collectionspace.collectionobject.schema.*.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"/>
@@ -138,7 +138,7 @@
                 <include name="${nuxeo.collectionobject.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.collectionobject.schema.common.jars.all}"/>
+                <include name="${nuxeo.collectionobject.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/concept/3rdparty/nuxeo-platform-cs-concept/build.xml b/services/concept/3rdparty/nuxeo-platform-cs-concept/build.xml
index 274e1dd0d..fd9dd71ff 100644
--- a/services/concept/3rdparty/nuxeo-platform-cs-concept/build.xml
+++ b/services/concept/3rdparty/nuxeo-platform-cs-concept/build.xml
@@ -12,9 +12,9 @@
     <property name="src" location="src"/>
     <!-- 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"/>
+        value="collectionspace.concept.doctype.*.jar"/>
+    <property name="nuxeo.concept.schema.jars.all"
+        value="collectionspace.concept.schema.*.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"/>
@@ -134,7 +134,7 @@
                 <include name="${nuxeo.concept.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.concept.schema.common.jars.all}"/>
+                <include name="${nuxeo.concept.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
index 2af2b9b9e..a84a5e339 100644
--- a/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
+++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
@@ -14,9 +14,9 @@
     <property name="dist"  location="dist"/>
     <!-- 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"/>
+        value="collectionspace.contact.doctype.*.jar"/>
+    <property name="nuxeo.contact.schema.jars.all"
+        value="collectionspace.contact.schema.*.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"/>
@@ -136,7 +136,7 @@
                 <include name="${nuxeo.contact.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.contact.schema.common.jars.all}"/>
+                <include name="${nuxeo.contact.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/build.xml b/services/group/3rdparty/nuxeo-platform-cs-group/build.xml
index ed94bf6db..601b7f4e8 100644
--- a/services/group/3rdparty/nuxeo-platform-cs-group/build.xml
+++ b/services/group/3rdparty/nuxeo-platform-cs-group/build.xml
@@ -12,9 +12,9 @@
     <property name="src" location="src"/>
     <!-- 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"/>
+        value="collectionspace.group.doctype.*.jar"/>
+    <property name="nuxeo.group.schema.jars.all"
+        value="collectionspace.group.schema.*.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"/>
@@ -134,7 +134,7 @@
                 <include name="${nuxeo.group.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.group.schema.common.jars.all}"/>
+                <include name="${nuxeo.group.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
index 951e6df41..5f78b0c19 100644
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
@@ -12,9 +12,9 @@
     <property name="src" location="src"/>
     <!-- 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"/>
+        value="collectionspace.intake.doctype.*.jar"/>
+    <property name="nuxeo.intake.schema.jars.all"
+        value="collectionspace.intake.schema.*.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"/>
@@ -134,7 +134,7 @@
                 <include name="${nuxeo.intake.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.intake.schema.common.jars.all}"/>
+                <include name="${nuxeo.intake.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
index 28983ab61..2f1a756c5 100644
--- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
+++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
@@ -13,9 +13,9 @@
     
     <!-- 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"/>
+        value="collectionspace.loanin.doctype.*.jar"/>
+    <property name="nuxeo.loanin.schema.jars.all"
+        value="collectionspace.loanin.schema.*.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"/>
@@ -135,7 +135,7 @@
                 <include name="${nuxeo.loanin.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.loanin.schema.common.jars.all}"/>
+                <include name="${nuxeo.loanin.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
index c09c9ec0e..3302c9ddf 100644
--- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
+++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
@@ -12,9 +12,9 @@
     <property name="src" location="src"/>
     <!-- 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"/>
+        value="collectionspace.loanout.doctype.*.jar"/>
+    <property name="nuxeo.loanout.schema.jars.all"
+        value="collectionspace.loanout.schema.*.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"/>
@@ -134,7 +134,7 @@
                 <include name="${nuxeo.loanout.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.loanout.schema.common.jars.all}"/>
+                <include name="${nuxeo.loanout.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/build.xml b/services/location/3rdparty/nuxeo-platform-cs-location/build.xml
index 6e387977e..01ce007bf 100644
--- a/services/location/3rdparty/nuxeo-platform-cs-location/build.xml
+++ b/services/location/3rdparty/nuxeo-platform-cs-location/build.xml
@@ -12,9 +12,9 @@
     <property name="src" location="src"/>
     <!-- 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"/>
+        value="collectionspace.location.doctype.*.jar"/>
+    <property name="nuxeo.location.schema.jars.all"
+        value="collectionspace.location.schema.*.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"/>
@@ -134,7 +134,7 @@
                 <include name="${nuxeo.location.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.location.schema.common.jars.all}"/>
+                <include name="${nuxeo.location.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/media/3rdparty/nuxeo-platform-cs-media/build.xml b/services/media/3rdparty/nuxeo-platform-cs-media/build.xml
index 428c9bda9..e6512e96e 100644
--- a/services/media/3rdparty/nuxeo-platform-cs-media/build.xml
+++ b/services/media/3rdparty/nuxeo-platform-cs-media/build.xml
@@ -12,9 +12,9 @@
     <property name="src" location="src"/>
     <!-- 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"/>
+        value="collectionspace.media.doctype.*.jar"/>
+    <property name="nuxeo.media.schema.jars.all"
+        value="collectionspace.media.schema.*.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"/>
@@ -134,7 +134,7 @@
                 <include name="${nuxeo.media.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.media.schema.common.jars.all}"/>
+                <include name="${nuxeo.media.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml b/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml
index b1f4dbf2c..f9b43a34c 100644
--- a/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml
+++ b/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml
@@ -12,9 +12,9 @@
     <property name="src" location="src"/>
     <!-- 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"/>
+        value="collectionspace.movement.doctype.*.jar"/>
+    <property name="nuxeo.movement.schema.jars.all"
+        value="collectionspace.movement.schema.*.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"/>
@@ -134,7 +134,7 @@
                 <include name="${nuxeo.movement.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.movement.schema.common.jars.all}"/>
+                <include name="${nuxeo.movement.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml
index 978cd39b6..17fd955a9 100644
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml
+++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml
@@ -12,9 +12,9 @@
     <property name="src" location="src"/>
     <!-- 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"/>
+        value="collectionspace.objectexit.doctype.*.jar"/>
+    <property name="nuxeo.objectexit.schema.jars.all"
+        value="collectionspace.objectexit.schema.*.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"/>
@@ -134,7 +134,7 @@
                 <include name="${nuxeo.objectexit.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.objectexit.schema.common.jars.all}"/>
+                <include name="${nuxeo.objectexit.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
index 8e68acda0..a454c1a8d 100644
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
@@ -12,9 +12,9 @@
     <property name="src" location="src"/>
     <!-- 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"/>
+        value="collectionspace.organization.doctype.*.jar"/>
+    <property name="nuxeo.organization.schema.jars.all"
+        value="collectionspace.organization.schema.*.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"/>
@@ -134,7 +134,7 @@
                 <include name="${nuxeo.organization.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.organization.schema.common.jars.all}"/>
+                <include name="${nuxeo.organization.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/build.xml b/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
index 4a8c55c28..2c6a59b28 100644
--- a/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
@@ -12,9 +12,9 @@
     <property name="src" location="src"/>
     <!-- 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"/>
+        value="collectionspace.person.doctype.*.jar"/>
+    <property name="nuxeo.person.schema.jars.all"
+        value="collectionspace.person.schema.*.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"/>
@@ -134,7 +134,7 @@
                 <include name="${nuxeo.person.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.person.schema.common.jars.all}"/>
+                <include name="${nuxeo.person.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/person/3rdparty/nuxeo-platform-person-lifesci/build.xml b/services/person/3rdparty/nuxeo-platform-person-lifesci/build.xml
index a3c1ff19b..13ef235e0 100644
--- a/services/person/3rdparty/nuxeo-platform-person-lifesci/build.xml
+++ b/services/person/3rdparty/nuxeo-platform-person-lifesci/build.xml
@@ -13,10 +13,8 @@
     <property name="build" location="build"/>
     <property name="dist"  location="dist"/>
     <!-- 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"/>
+    <!-- Both doctype and schema JAR(s) are removed via the 'undeploy' target -->
+    <!-- in another Ant buildfile, in a peer module to this module -->
     <!-- 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"/>
diff --git a/services/place/3rdparty/nuxeo-platform-cs-place/build.xml b/services/place/3rdparty/nuxeo-platform-cs-place/build.xml
index bf6b21a0b..0ed57634d 100644
--- a/services/place/3rdparty/nuxeo-platform-cs-place/build.xml
+++ b/services/place/3rdparty/nuxeo-platform-cs-place/build.xml
@@ -12,9 +12,9 @@
     <property name="src" location="src"/>
     <!-- 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"/>
+        value="collectionspace.place.doctype.*.jar"/>
+    <property name="nuxeo.place.schema.jars.all"
+        value="collectionspace.place.schema.*.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"/>
@@ -134,7 +134,7 @@
                 <include name="${nuxeo.place.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.place.schema.common.jars.all}"/>
+                <include name="${nuxeo.place.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/report/3rdparty/nuxeo-platform-cs-report/build.xml b/services/report/3rdparty/nuxeo-platform-cs-report/build.xml
index abc0fe953..272cfda25 100644
--- a/services/report/3rdparty/nuxeo-platform-cs-report/build.xml
+++ b/services/report/3rdparty/nuxeo-platform-cs-report/build.xml
@@ -12,9 +12,9 @@
     <property name="src" location="src"/>
     <!-- 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"/>
+        value="collectionspace.report.doctype.*.jar"/>
+    <property name="nuxeo.report.schema.jars.all"
+        value="collectionspace.report.schema.*.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"/>
@@ -134,7 +134,7 @@
                 <include name="${nuxeo.report.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.report.schema.common.jars.all}"/>
+                <include name="${nuxeo.report.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml
index 0d90d72d6..bb70eed72 100644
--- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml
+++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml
@@ -12,11 +12,11 @@
     <property name="src" location="src"/>
     <!-- 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'. -->
+    <!-- the names 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"/>
+        value="collectionspace.taxon.doctype.*.jar"/>
+    <property name="nuxeo.taxonomy.schema.jars.all"
+        value="collectionspace.taxon.schema.*.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"/>
@@ -136,7 +136,7 @@
                 <include name="${nuxeo.taxonomy.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.taxonomy.schema.common.jars.all}"/>
+                <include name="${nuxeo.taxonomy.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
index 1dbd248e4..abbd8cc05 100644
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
@@ -12,11 +12,11 @@
     <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'. -->
+    <!-- the names of the legacy JAR files, below, include the string 'vocabulary'. -->
     <property name="nuxeo.vocabulary.doctype.jars.all"
-        value="collectionspace.vocabularyitem.doctype*.jar"/>
-    <property name="nuxeo.vocabulary.schema.common.jars.all"
-        value="collectionspace.vocabularyitem.schema*_common.jar"/>
+        value="collectionspace.vocabularyitem.doctype.*.jar"/>
+    <property name="nuxeo.vocabulary.schema.jars.all"
+        value="collectionspace.vocabularyitem.schema.*.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"/>
@@ -136,7 +136,7 @@
                 <include name="${nuxeo.vocabulary.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.vocabulary.schema.common.jars.all}"/>
+                <include name="${nuxeo.vocabulary.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">
diff --git a/services/work/3rdparty/nuxeo-platform-cs-work/build.xml b/services/work/3rdparty/nuxeo-platform-cs-work/build.xml
index 692a4f7b3..54c8c1457 100644
--- a/services/work/3rdparty/nuxeo-platform-cs-work/build.xml
+++ b/services/work/3rdparty/nuxeo-platform-cs-work/build.xml
@@ -12,9 +12,9 @@
     <property name="src" location="src"/>
     <!-- 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.common.jars.all"
-        value="collectionspace.work.schema*_common.jar"/>
+        value="collectionspace.work.doctype.*.jar"/>
+    <property name="nuxeo.work.schema.jars.all"
+        value="collectionspace.work.schema.*.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"/>
@@ -134,7 +134,7 @@
                 <include name="${nuxeo.work.doctype.jars.all}"/>
             </fileset>
             <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.work.schema.common.jars.all}"/>
+                <include name="${nuxeo.work.schema.jars.all}"/>
             </fileset>
             <!-- Undeploy legacy artifacts -->
             <fileset dir="${jee.deploy.nuxeo.plugins}">