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

---
 services/collectionobject/3rdparty/build.xml           | 10 +++++-----
 .../.settings/org.maven.ide.eclipse.prefs              |  0
 .../build.xml                                          |  0
 .../pom.xml                                            |  0
 .../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
 services/collectionobject/3rdparty/pom.xml             |  2 +-
 11 files changed, 6 insertions(+), 6 deletions(-)
 rename services/collectionobject/3rdparty/{nuxeo-platform-cs-collectionobject => nuxeo-platform-collectionobject-core}/.settings/org.maven.ide.eclipse.prefs (100%)
 rename services/collectionobject/3rdparty/{nuxeo-platform-cs-collectionobject => nuxeo-platform-collectionobject-core}/build.xml (100%)
 rename services/collectionobject/3rdparty/{nuxeo-platform-cs-collectionobject => nuxeo-platform-collectionobject-core}/pom.xml (100%)
 rename services/collectionobject/3rdparty/{nuxeo-platform-cs-collectionobject => nuxeo-platform-collectionobject-core}/src/main/resources/META-INF/MANIFEST.MF (100%)
 rename services/collectionobject/3rdparty/{nuxeo-platform-cs-collectionobject => nuxeo-platform-collectionobject-core}/src/main/resources/OSGI-INF/core-types-contrib.xml (100%)
 rename services/collectionobject/3rdparty/{nuxeo-platform-cs-collectionobject => nuxeo-platform-collectionobject-core}/src/main/resources/OSGI-INF/deployment-fragment.xml (100%)
 rename services/collectionobject/3rdparty/{nuxeo-platform-cs-collectionobject => nuxeo-platform-collectionobject-core}/src/main/resources/OSGI-INF/ecm-types-contrib.xml (100%)
 rename services/collectionobject/3rdparty/{nuxeo-platform-cs-collectionobject => nuxeo-platform-collectionobject-core}/src/main/resources/OSGI-INF/layouts-contrib.xml (100%)
 rename services/collectionobject/3rdparty/{nuxeo-platform-cs-collectionobject => nuxeo-platform-collectionobject-core}/src/main/resources/OSGI-INF/life-cycle-contrib.xml (100%)

diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
index de0e27d3c..9cb902e30 100644
--- a/services/collectionobject/3rdparty/build.xml
+++ b/services/collectionobject/3rdparty/build.xml
@@ -9,7 +9,7 @@
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
 	<property name="nuxeo-platform-collectionobjects_common" value="nuxeo-platform-collectionobjects_common"/>
-	<property name="nuxeo-platform-cs-collectionobject" value="nuxeo-platform-cs-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="" />
     <property name="src" location="src"/>
@@ -116,28 +116,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-cs-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-cs-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-cs-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-cs-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-cs-collectionobject/.settings/org.maven.ide.eclipse.prefs b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/.settings/org.maven.ide.eclipse.prefs
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/.settings/org.maven.ide.eclipse.prefs
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/build.xml
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/build.xml
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/pom.xml
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/pom.xml
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/META-INF/MANIFEST.MF b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/META-INF/MANIFEST.MF
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/src/main/resources/META-INF/MANIFEST.MF
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/src/main/resources/OSGI-INF/core-types-contrib.xml
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/core-types-contrib.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/src/main/resources/OSGI-INF/core-types-contrib.xml
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/deployment-fragment.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/src/main/resources/OSGI-INF/deployment-fragment.xml
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/deployment-fragment.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/src/main/resources/OSGI-INF/deployment-fragment.xml
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/src/main/resources/OSGI-INF/ecm-types-contrib.xml
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/ecm-types-contrib.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/src/main/resources/OSGI-INF/ecm-types-contrib.xml
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/src/main/resources/OSGI-INF/layouts-contrib.xml
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/src/main/resources/OSGI-INF/layouts-contrib.xml
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/src/main/resources/OSGI-INF/life-cycle-contrib.xml
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/life-cycle-contrib.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/src/main/resources/OSGI-INF/life-cycle-contrib.xml
diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml
index ef1a30ac6..ed75b9eee 100644
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -19,7 +19,7 @@
 
     <modules>
     	<module>nuxeo-platform-collectionobjects_common</module>
-		<module>nuxeo-platform-cs-collectionobject</module>
+		<module>nuxeo-platform-collectionobject-core</module>
         <module>nuxeo-platform-collectionobject-hearst</module>
     </modules>
 
-- 
2.47.3