From e3b8e1286fb6317fc172c77c8ef9b538c8b70237 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 8 Aug 2013 19:55:01 -0700
Subject: [PATCH] CSPACE-6122,CSPACE-6123: Update Citation and Work authorities
 to generate Services doctype bundles following unified config changes.
 (Commit also includes minor, similar cleanup in Location module.)

---
 services/citation/3rdparty/build.xml                        | 6 +++++-
 .../citation/3rdparty/nuxeo-platform-cs-citation/pom.xml    | 1 -
 services/citation/3rdparty/pom.xml                          | 5 +++--
 services/location/3rdparty/build.xml                        | 2 +-
 services/location/3rdparty/pom.xml                          | 4 +++-
 services/work/3rdparty/build.xml                            | 6 +++++-
 services/work/3rdparty/nuxeo-platform-cs-work/pom.xml       | 1 -
 services/work/3rdparty/pom.xml                              | 5 +++--
 8 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/services/citation/3rdparty/build.xml b/services/citation/3rdparty/build.xml
index 5e8be50b9..f26ed238c 100644
--- a/services/citation/3rdparty/build.xml
+++ b/services/citation/3rdparty/build.xml
@@ -110,11 +110,15 @@
 
     <target name="deploy" depends="install"
     description="deploy citation in ${jee.server.nuxeo}">
-        <ant antfile="nuxeo-platform-cs-citation/build.xml" target="deploy" inheritall="false"/>
+        <!-- This target is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool 
+            <ant antfile="nuxeo-platform-cs-citation/build.xml" target="deploy" inheritall="false"/>
+        -->
     </target>
 
     <target name="undeploy"
     description="undeploy citation from ${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. --> 
         <ant antfile="nuxeo-platform-cs-citation/build.xml" target="undeploy" inheritall="false"/>
    </target>
 
diff --git a/services/citation/3rdparty/nuxeo-platform-cs-citation/pom.xml b/services/citation/3rdparty/nuxeo-platform-cs-citation/pom.xml
index c9781309c..7f356c0d8 100644
--- a/services/citation/3rdparty/nuxeo-platform-cs-citation/pom.xml
+++ b/services/citation/3rdparty/nuxeo-platform-cs-citation/pom.xml
@@ -8,7 +8,6 @@
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.citation.3rdparty.nuxeo</artifactId>
     <name>services.citation.3rdparty.nuxeo</name>
     <packaging>jar</packaging>
diff --git a/services/citation/3rdparty/pom.xml b/services/citation/3rdparty/pom.xml
index 139cf1345..ce3c0c946 100644
--- a/services/citation/3rdparty/pom.xml
+++ b/services/citation/3rdparty/pom.xml
@@ -9,7 +9,6 @@
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.citation.3rdparty</artifactId>
     <name>services.citation.3rdparty</name>
     <packaging>pom</packaging>
@@ -25,6 +24,8 @@
 	</properties>
 
     <modules>
-        <module>nuxeo-platform-cs-citation</module>     
+        <!-- This module is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
+            <module>nuxeo-platform-cs-citation</module>
+        -->   
     </modules>
 </project>
diff --git a/services/location/3rdparty/build.xml b/services/location/3rdparty/build.xml
index d592b2728..d795bfef5 100644
--- a/services/location/3rdparty/build.xml
+++ b/services/location/3rdparty/build.xml
@@ -110,7 +110,7 @@
 
     <target name="deploy" depends="install"
     description="deploy location in ${jee.server.nuxeo}">
-    	<!-- This module is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
+    	<!-- This target is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
         <ant antfile="nuxeo-platform-cs-location/build.xml" target="deploy" inheritall="false"/>
         -->
     </target>
diff --git a/services/location/3rdparty/pom.xml b/services/location/3rdparty/pom.xml
index 85c35fbf2..a94aa7df0 100644
--- a/services/location/3rdparty/pom.xml
+++ b/services/location/3rdparty/pom.xml
@@ -16,6 +16,8 @@
     </description>
 
     <modules>
-        <module>nuxeo-platform-cs-location</module>
+        <!-- This module is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
+            <module>nuxeo-platform-cs-location</module>
+        -->
     </modules>
 </project>
diff --git a/services/work/3rdparty/build.xml b/services/work/3rdparty/build.xml
index da7bf9712..cb309d938 100644
--- a/services/work/3rdparty/build.xml
+++ b/services/work/3rdparty/build.xml
@@ -110,11 +110,15 @@
 
     <target name="deploy" depends="install"
     description="deploy work in ${jee.server.nuxeo}">
-        <ant antfile="nuxeo-platform-cs-work/build.xml" target="deploy" inheritall="false"/>
+        <!-- This target is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool 
+            <ant antfile="nuxeo-platform-cs-work/build.xml" target="deploy" inheritall="false"/>
+        -->
     </target>
 
     <target name="undeploy"
     description="undeploy work from ${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. --> 
         <ant antfile="nuxeo-platform-cs-work/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/work/3rdparty/nuxeo-platform-cs-work/pom.xml b/services/work/3rdparty/nuxeo-platform-cs-work/pom.xml
index fa95ad237..6322cf788 100644
--- a/services/work/3rdparty/nuxeo-platform-cs-work/pom.xml
+++ b/services/work/3rdparty/nuxeo-platform-cs-work/pom.xml
@@ -8,7 +8,6 @@
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.work.3rdparty.nuxeo</artifactId>
     <name>services.work.3rdparty.nuxeo</name>
     <packaging>jar</packaging>
diff --git a/services/work/3rdparty/pom.xml b/services/work/3rdparty/pom.xml
index 4a8784380..2bfdeee34 100644
--- a/services/work/3rdparty/pom.xml
+++ b/services/work/3rdparty/pom.xml
@@ -9,7 +9,6 @@
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.work.3rdparty</artifactId>
     <name>services.work.3rdparty</name>
     <packaging>pom</packaging>
@@ -18,6 +17,8 @@
     </description>
 
     <modules>
-        <module>nuxeo-platform-cs-work</module>
+        <!-- This module is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
+            <module>nuxeo-platform-cs-work</module>
+        -->
     </modules>
 </project>
-- 
2.47.3