From 03cbdda4dc5c158a8b3a323a1d6a846e8716d1f3 Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Fri, 17 Jun 2011 22:03:44 +0000
Subject: [PATCH] CSPACE-3441: Updating CollectionObject doctype/bundle module
 names to better reflect reality.

---
 services/collectionobject/3rdparty/build.xml           | 10 +++++-----
 .../nuxeo-platform-collectionobject-core/build.xml     |  4 ++--
 .../nuxeo-platform-collectionobject-core/pom.xml       |  3 +--
 .../nuxeo-platform-collectionobject-hearst/build.xml   |  4 ++--
 .../nuxeo-platform-collectionobject-hearst/pom.xml     |  3 +--
 .../build.xml                                          |  4 ++--
 .../pom.xml                                            |  3 +--
 .../src/main/resources/META-INF/MANIFEST.MF            |  0
 .../src/main/resources/OSGI-INF/core-types-contrib.xml |  0
 .../main/resources/OSGI-INF/deployment-fragment.xml    |  0
 .../src/main/resources/OSGI-INF/ecm-types-contrib.xml  |  0
 .../src/main/resources/OSGI-INF/layouts-contrib.xml    |  0
 .../src/main/resources/OSGI-INF/life-cycle-contrib.xml |  0
 .../resources/schemas/collectionobjects_common.xsd     |  0
 services/collectionobject/3rdparty/pom.xml             |  2 +-
 15 files changed, 15 insertions(+), 18 deletions(-)
 rename services/collectionobject/3rdparty/{nuxeo-platform-collectionobjects_common => nuxeo-platform-collectionobject}/build.xml (93%)
 rename services/collectionobject/3rdparty/{nuxeo-platform-collectionobjects_common => nuxeo-platform-collectionobject}/pom.xml (87%)
 rename services/collectionobject/3rdparty/{nuxeo-platform-collectionobjects_common => nuxeo-platform-collectionobject}/src/main/resources/META-INF/MANIFEST.MF (100%)
 rename services/collectionobject/3rdparty/{nuxeo-platform-collectionobjects_common => nuxeo-platform-collectionobject}/src/main/resources/OSGI-INF/core-types-contrib.xml (100%)
 rename services/collectionobject/3rdparty/{nuxeo-platform-collectionobjects_common => nuxeo-platform-collectionobject}/src/main/resources/OSGI-INF/deployment-fragment.xml (100%)
 rename services/collectionobject/3rdparty/{nuxeo-platform-collectionobjects_common => nuxeo-platform-collectionobject}/src/main/resources/OSGI-INF/ecm-types-contrib.xml (100%)
 rename services/collectionobject/3rdparty/{nuxeo-platform-collectionobjects_common => nuxeo-platform-collectionobject}/src/main/resources/OSGI-INF/layouts-contrib.xml (100%)
 rename services/collectionobject/3rdparty/{nuxeo-platform-collectionobjects_common => nuxeo-platform-collectionobject}/src/main/resources/OSGI-INF/life-cycle-contrib.xml (100%)
 rename services/collectionobject/3rdparty/{nuxeo-platform-collectionobjects_common => nuxeo-platform-collectionobject}/src/main/resources/schemas/collectionobjects_common.xsd (100%)

diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
index 9cb902e30..45d33f7c0 100644
--- a/services/collectionobject/3rdparty/build.xml
+++ b/services/collectionobject/3rdparty/build.xml
@@ -8,7 +8,7 @@
      <!-- enviornment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
-	<property name="nuxeo-platform-collectionobjects_common" value="nuxeo-platform-collectionobjects_common"/>
+	<property name="nuxeo-platform-collectionobject" value="nuxeo-platform-collectionobject"/>
 	<property name="nuxeo-platform-collectionobject-core" value="nuxeo-platform-collectionobject-core"/>
 	<property name="nuxeo-platform-collectionobject-hearst" value="nuxeo-platform-collectionobject-hearst"/>
     <property name="mvn.opts" value="" />
@@ -115,28 +115,28 @@
 
     <target name="deploy" depends="install"
     description="deploy collectionobject in ${jboss.server.nuxeo}">
-        <ant antfile="${nuxeo-platform-collectionobjects_common}/build.xml" target="deploy" inheritall="false"/>
+        <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="deploy" inheritall="false"/>
         <ant antfile="${nuxeo-platform-collectionobject-core}/build.xml" target="deploy" inheritall="false"/>
         <ant antfile="${nuxeo-platform-collectionobject-hearst}/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
     description="undeploy collectionobject from ${jboss.server.nuxeo}">
-        <ant antfile="${nuxeo-platform-collectionobjects_common}/build.xml" target="undeploy" inheritall="false"/>
+        <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="undeploy" inheritall="false"/>
         <ant antfile="${nuxeo-platform-collectionobject-core}/build.xml" target="undeploy" inheritall="false"/>
         <ant antfile="${nuxeo-platform-collectionobject-hearst}/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
     <target name="dist"
     description="generate distribution for collectionobject" depends="package">
-        <ant antfile="${nuxeo-platform-collectionobjects_common}/build.xml" target="dist" inheritall="false"/>
+        <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="dist" inheritall="false"/>
         <ant antfile="${nuxeo-platform-collectionobject-core}/build.xml" target="dist" inheritall="false"/>
         <ant antfile="${nuxeo-platform-collectionobject-hearst}/build.xml" target="dist" inheritall="false"/>
     </target>
 
     <target name="dist_installer"
     description="generate distribution for collectionobject" depends="package">
-        <ant antfile="${nuxeo-platform-collectionobjects_common}/build.xml" target="dist_installer" inheritall="false"/>
+        <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="dist_installer" inheritall="false"/>
         <ant antfile="${nuxeo-platform-collectionobject-core}/build.xml" target="dist_installer" inheritall="false"/>
         <ant antfile="${nuxeo-platform-collectionobject-hearst}/build.xml" target="dist_installer" inheritall="false"/>
     </target>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/build.xml
index 5ea651d08..4a43b5e32 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/build.xml
@@ -13,9 +13,9 @@
     <property name="build" location="build"/>
     <property name="dist"  location="dist"/>
     <property name="nuxeo.collectionobject.jar"
-        value="org.collectionspace.services.collectionobject.CollectionObjectTenant1.nuxeo-${cspace.release}.jar"/>
+        value="org.collectionspace.services.collectionobject.3rdparty.CollectionObjectTenant1.nuxeo-${cspace.release}.jar"/>
     <property name="nuxeo.collectionobject.jars.all"
-        value="org.collectionspace.services.collectionobject.CollectionObjectTenant1.nuxeo-*.jar"/>
+        value="org.collectionspace.services.collectionobject.3rdparty.CollectionObjectTenant1.nuxeo-*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/pom.xml
index 183a03700..76eb93c81 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/pom.xml
@@ -9,8 +9,7 @@
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <artifactId>org.collectionspace.services.collectionobject.CollectionObjectTenant1.nuxeo</artifactId>
-    <name>services.collectionobject.CollectionObjectTenant1.nuxeo</name>
+    <artifactId>org.collectionspace.services.collectionobject.3rdparty.CollectionObjectTenant1.nuxeo</artifactId>
     <packaging>jar</packaging>
     <description>
         CollectionObject Nuxeo document type for Tenant ID = "1"
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/build.xml
index 6f383736e..4448992a3 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/build.xml
@@ -13,9 +13,9 @@
     <property name="build" location="build"/>
     <property name="dist"  location="dist"/>
     <property name="nuxeo.collectionobject.jar"
-        value="org.collectionspace.services.collectionobject.CollectionObjectTenant2.nuxeo-${cspace.release}.jar"/>
+        value="org.collectionspace.services.collectionobject.3rdparty.CollectionObjectTenant2.nuxeo-${cspace.release}.jar"/>
     <property name="nuxeo.collectionobject.jars.all"
-        value="org.collectionspace.services.collectionobject.CollectionObjectTenant2.nuxeo-*.jar"/>
+        value="org.collectionspace.services.collectionobject.3rdparty.CollectionObjectTenant2.nuxeo-*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/pom.xml
index af484acfd..bbb8f09c5 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/pom.xml
@@ -9,8 +9,7 @@
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <artifactId>org.collectionspace.services.collectionobject.CollectionObjectTenant2.nuxeo</artifactId>
-    <name>services.collectionobject.CollectionObjectTenant2.nuxeo</name>
+    <artifactId>org.collectionspace.services.collectionobject.3rdparty.CollectionObjectTenant2.nuxeo</artifactId>
     <packaging>jar</packaging>
     <description>
         CollectionObject Nuxeo document type for Tenant ID = "1"
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/build.xml
similarity index 93%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/build.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject/build.xml
index 1df4e901c..ac93534b1 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/build.xml
@@ -13,9 +13,9 @@
     <property name="build" location="build"/>
     <property name="dist"  location="dist"/>
     <property name="nuxeo.collectionobject.jar"
-        value="org.collectionspace.services.collectionobject.collectionobjects_common.nuxeo-${cspace.release}.jar"/>
+        value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-${cspace.release}.jar"/>
     <property name="nuxeo.collectionobject.jars.all"
-        value="org.collectionspace.services.collectionobject.collectionobjects_common.nuxeo-*.jar"/>
+        value="org.collectionspace.services.collectionobject.*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/pom.xml
similarity index 87%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/pom.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject/pom.xml
index b711ec2fe..5e929e3e6 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/pom.xml
@@ -9,8 +9,7 @@
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <artifactId>org.collectionspace.services.collectionobject.collectionobjects_common.nuxeo</artifactId>
-    <name>org.collectionspace.services.collectionobject.collectionobjects_common.nuxeo</name>
+    <artifactId>org.collectionspace.services.collectionobject.3rdparty.nuxeo</artifactId>
     <packaging>jar</packaging>
     <description>
         CollectionObject Common Nuxeo document type
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/META-INF/MANIFEST.MF b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/META-INF/MANIFEST.MF
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/META-INF/MANIFEST.MF
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/core-types-contrib.xml
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/core-types-contrib.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/core-types-contrib.xml
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/deployment-fragment.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/deployment-fragment.xml
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/deployment-fragment.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/deployment-fragment.xml
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/ecm-types-contrib.xml
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/ecm-types-contrib.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/ecm-types-contrib.xml
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/layouts-contrib.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/life-cycle-contrib.xml
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/life-cycle-contrib.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/life-cycle-contrib.xml
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/schemas/collectionobjects_common.xsd b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/schemas/collectionobjects_common.xsd
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml
index ed75b9eee..01f759aec 100644
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -18,7 +18,7 @@
     </description>
 
     <modules>
-    	<module>nuxeo-platform-collectionobjects_common</module>
+    	<module>nuxeo-platform-collectionobject</module>
 		<module>nuxeo-platform-collectionobject-core</module>
         <module>nuxeo-platform-collectionobject-hearst</module>
     </modules>
-- 
2.47.3