]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
CSPACE-6142: Undeploy new-style Nuxeo doctype and schema JARs, along with legacy...
authorAron Roberts <aron@socrates.berkeley.edu>
Tue, 13 Aug 2013 01:53:06 +0000 (18:53 -0700)
committerAron Roberts <aron@socrates.berkeley.edu>
Tue, 13 Aug 2013 01:53:06 +0000 (18:53 -0700)
22 files changed:
services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml
services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml
services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
services/concept/3rdparty/nuxeo-platform-cs-concept/build.xml
services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
services/group/3rdparty/nuxeo-platform-cs-group/build.xml
services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
services/location/3rdparty/nuxeo-platform-cs-location/build.xml
services/media/3rdparty/nuxeo-platform-cs-media/build.xml
services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml
services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml
services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
services/person/3rdparty/nuxeo-platform-cs-person/build.xml
services/place/3rdparty/nuxeo-platform-cs-place/build.xml
services/report/3rdparty/nuxeo-platform-cs-report/build.xml
services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml
services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
services/work/3rdparty/nuxeo-platform-cs-work/build.xml

index de608a466bedcde931faa6c7d20206b9383a5b4f..8cc890bb57f7482da3c7b1b1a7c7e3063563e64b 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index eb3f34a5e3630233c64ef5c339894fd3d83c98c5..5f5d2b5da8725f06f1d0c222eaf20a1b03d4ba0f 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index 6d793b26d2322726b67bd16667c8e977109c8a4a..19fee4a31bdef3c9684eee0a33e70f885896a474 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index 5180b1769fa0baabed39ce0b0b37f1f30d30cfd9..9c5e38dd98406f99a7b390b7105f5625390c5f05 100644 (file)
@@ -1,4 +1,4 @@
-\r
+<?xml version="1.0" encoding="UTF-8"?>\r
 <project name="nuxeo-platform-collectionobject-lifesci" default="package" basedir=".">\r
     <description>\r
         Collectionobject nuxeo document type for the lifesci tenant\r
     <property name="src" location="src"/>\r
     <property name="build" location="build"/>\r
     <property name="dist"  location="dist"/>\r
+    <!-- JAR files used by CollectionSpace 4.0 and later -->\r
+    <property name="nuxeo.collectionobject.doctype.jars.all"\r
+        value="collectionspace.collectionobject.doctype*.jar"/>\r
+    <property name="nuxeo.collectionobject.schema.naturalhistory.jars.all"\r
+        value="collectionspace.collectionobject.schema*_naturalhistory.jar"/>\r
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> \r
+    <property name="nuxeo.collectionobject.legacy.jars.all"\r
+        value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-*.jar"/>\r
     <property name="nuxeo.collectionobject.jar"\r
         value="org.collectionspace.services.collectionobject.3rdparty.lifesci.nuxeo-${cspace.release}.jar"/>\r
-    <property name="nuxeo.collectionobject.jars.all"\r
-        value="org.collectionspace.services.collectionobject.3rdparty.*.nuxeo-*.jar"/>\r
-\r
+    \r
     <condition property="osfamily-unix">\r
         <os family="unix" />\r
     </condition>\r
 \r
     <target name="deploy" depends="install"\r
         description="deploy collectionobject doctype in ${jee.server.nuxeo}">\r
+        <!-- This target is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool\r
+        leaving this only for backwards compatibility reasons. -->  \r
         <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"\r
-        todir="${jee.deploy.nuxeo.plugins}"/>\r
+            todir="${jee.deploy.nuxeo.plugins}"/>\r
     </target>\r
 \r
     <target name="undeploy"\r
index 52268b1dd00ae04fcbff1a55add79f64543e5cd9..b8bbd38493705c4f4e4381a6726d9bb807597935 100644 (file)
@@ -1,4 +1,4 @@
-\r
+<?xml version="1.0" encoding="UTF-8"?>\r
 <project name="nuxeo-platform-collectionobjects_common" default="package" basedir=".">\r
     <description>\r
         CollectionobjectsCommon Nuxeo document type\r
     <property name="src" location="src"/>\r
     <property name="build" location="build"/>\r
     <property name="dist"  location="dist"/>\r
-    <property name="nuxeo.collectionobject.jar"\r
+    <!-- JAR files used by CollectionSpace 4.0 and later -->\r
+    <property name="nuxeo.collectionobject.doctype.jars.all"\r
+        value="collectionspace.collectionobject.doctype*.jar"/>\r
+    <property name="nuxeo.collectionobject.schema.common.jars.all"\r
+        value="collectionspace.collectionobject.schema*_common.jar"/>\r
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> \r
+    <property name="nuxeo.collectionobject.legacy.jars.all"\r
+        value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-*.jar"/>\r
+    <property name="nuxeo.collectionobject.legacy.jar"\r
         value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-${cspace.release}.jar"/>\r
-    <property name="nuxeo.collectionobject.jars.all"\r
-        value="org.collectionspace.services.collectionobject.*.jar"/>\r
 \r
     <condition property="osfamily-unix">\r
         <os family="unix" />\r
 \r
     <target name="deploy" depends="install"\r
         description="Deploy CollectionObjectsCommon doctype in ${jee.server.nuxeo}">\r
-        <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"\r
-        todir="${jee.deploy.nuxeo.plugins}"/>\r
+        <!-- This target is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool\r
+        leaving this only for backwards compatibility reasons. -->  \r
+        <copy file="${basedir}/target/${nuxeo.collectionobject.legacy.jar}"\r
+            todir="${jee.deploy.nuxeo.plugins}"/>\r
     </target>\r
 \r
     <target name="undeploy"\r
         description="Undeploy CollectionObjectsCommon doctype from ${jee.server.nuxeo}">\r
         <delete>\r
+            <!-- Undeploy doctype and schema artifacts -->\r
+            <fileset dir="${jee.deploy.nuxeo.plugins}">\r
+                <include name="${nuxeo.collectionobject.doctype.jars.all}"/>\r
+            </fileset>\r
             <fileset dir="${jee.deploy.nuxeo.plugins}">\r
-                <include name="${nuxeo.collectionobject.jars.all}"/>\r
+                <include name="${nuxeo.collectionobject.schema.common.jars.all}"/>\r
+            </fileset>\r
+            <!-- Undeploy legacy artifacts -->\r
+            <fileset dir="${jee.deploy.nuxeo.plugins}">\r
+                <include name="${nuxeo.collectionobject.legacy.jars.all}"/>\r
+            </fileset>\r
+            <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->\r
+            <fileset dir="${jee.deploy.nuxeo.system}">\r
+                <include name="${nuxeo.collectionobject.legacy.jars.all}"/>\r
             </fileset>\r
         </delete>\r
     </target>\r
     <target name="dist"\r
        description="generate distribution for collectionobject doctype" depends="package">\r
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">\r
-            <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>\r
+            <fileset file="${basedir}/target/${nuxeo.collectionobject.legacy.jar}"/>\r
         </copy>\r
     </target>\r
 \r
     <target name="dist_installer"\r
        description="Creates an installer distribution for CollectionObjectsCommon doctype" depends="package">\r
         <copy todir="${services.trunk}/${dist.installer.services}/collectionobject/nuxeo">\r
-            <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>\r
+            <fileset file="${basedir}/target/${nuxeo.collectionobject.legacy.jar}"/>\r
         </copy>\r
     </target>\r
 </project>\r
index 9a64403012526768771819e52cc0d3931c7c4a0f..a49c5cc13ae039bbd9882c91858a4baa32e58733 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index dade300f90fa009bc42360d868da01e28bcc8379..574f331ba5984c3b9693ee21707ec8b8155d1e08 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index 8e8e7c7bf329261f2759ca49f300b11fcb6a3664..0c4af8cd234ab2fe37f152cf07e35a2836ae29d2 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index bfc32221dd393635be322df9d9b33f6ca173be9e..7676d61562cf4a0056650d0ce54b9f3988f3fe2c 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index 780a13b48bcecda9a87b616a95c1a5b20e955504..4e9ffaa788052f11a40ad031fd024f36d5863ed3 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index 3ef1f46c38d05a807f0985d3e231030951961bd0..1ef7df008c88958debc92d4f7123eb9f448c5d88 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index 72d27426eb5b6c1a8e4837d3db3c78d2f11fc62a..8818f707df4db2aea83304a7c059744f2c9b6673 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index 3691df6ad210ff9b77139e28a1e179c04342e63c..745b97b15aea4031be844fa7ba602c253fde9814 100644 (file)
@@ -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
     <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>
 
     <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>
     <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>
 
index 3aca543499212b6d2ac1ada125a6fc4ee6f08ad4..8e0a404c39732d73f9e44132c55a93dffed343b5 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index 2dec153c4a41a0482e1050bf4717fe3b976fb647..a9fa6b0d1fe6190b56a50748a30c2e1632766e33 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index b1cbce2e9d805ca358acf167e07dbb16e40c7b94..e999a19a49ab0796445987c3b363b199ede89f63 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index 2cb87bccf9668daa3893cc4bf502cc1f7d1006f2..0be228b4c46eaae583673e32ae43ea41cc83b741 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index ceb54d64ee1304ec16326693898f0d4c2bfec107..54f7d28bd55b6d07afea252a37fb6028acd7773a 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index 20b49530af2940c6ccd816fd6ed5c2cb24069eb6..fac250cfc975d83efa9d339bdbdc0151e4417a34 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index 47dfd9e4b3868f7300ec2df23c1cf9a2b99d7f09..9950070e659c642a57ab558118391dc7818a0014 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index bc5d5416d73c6d26f5526bbc9315aa29f742d54b..fd2d3cf11f3dcd2dd08e84f9eaa5896da6641417 100644 (file)
@@ -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
     <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" />
 
     <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>
     <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>
 
index 58bdadb07fe9683417c78268bcdca69cce6ae33a..43cf9aac025ebf3061427a2d6d405f766334c62c 100644 (file)
@@ -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
     <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" />
         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>
 
                 <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}">
     <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>