CSPACE-3441: Updating CollectionObject doctype/bundle module names to better reflect...

diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
index 9cb902e30e423aece79bd769cb23d1ffb5aa9df0..45d33f7c0b5f8f36076f3fe7b6a5babfd0f6ba18 100644 (file)
--- a/services/collectionobject/3rdparty/build.xml
+++ b/services/collectionobject/3rdparty/build.xml
@@ -8,7 +8,7 @@
      <!-- enviornment should be declared before reading build.properties -->\r
     <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
-       <property name="nuxeo-platform-collectionobjects_common" value="nuxeo-platform-collectionobjects_common"/>\r
+       <property name="nuxeo-platform-collectionobject" value="nuxeo-platform-collectionobject"/>\r
        <property name="nuxeo-platform-collectionobject-core" value="nuxeo-platform-collectionobject-core"/>\r
        <property name="nuxeo-platform-collectionobject-hearst" value="nuxeo-platform-collectionobject-hearst"/>\r
     <property name="mvn.opts" value="" />\r
@@ -115,28 +115,28 @@
 \r
     <target name="deploy" depends="install"\r
     description="deploy collectionobject in ${jboss.server.nuxeo}">\r
-        <ant antfile="${nuxeo-platform-collectionobjects_common}/build.xml" target="deploy" inheritall="false"/>\r
+        <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="deploy" inheritall="false"/>\r
         <ant antfile="${nuxeo-platform-collectionobject-core}/build.xml" target="deploy" inheritall="false"/>\r
         <ant antfile="${nuxeo-platform-collectionobject-hearst}/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r
 \r
     <target name="undeploy"\r
     description="undeploy collectionobject from ${jboss.server.nuxeo}">\r
-        <ant antfile="${nuxeo-platform-collectionobjects_common}/build.xml" target="undeploy" inheritall="false"/>\r
+        <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="undeploy" inheritall="false"/>\r
         <ant antfile="${nuxeo-platform-collectionobject-core}/build.xml" target="undeploy" inheritall="false"/>\r
         <ant antfile="${nuxeo-platform-collectionobject-hearst}/build.xml" target="undeploy" inheritall="false"/>\r
     </target>\r
 \r
     <target name="dist"\r
     description="generate distribution for collectionobject" depends="package">\r
-        <ant antfile="${nuxeo-platform-collectionobjects_common}/build.xml" target="dist" inheritall="false"/>\r
+        <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="dist" inheritall="false"/>\r
         <ant antfile="${nuxeo-platform-collectionobject-core}/build.xml" target="dist" inheritall="false"/>\r
         <ant antfile="${nuxeo-platform-collectionobject-hearst}/build.xml" target="dist" inheritall="false"/>\r
     </target>\r
 \r
     <target name="dist_installer"\r
     description="generate distribution for collectionobject" depends="package">\r
-        <ant antfile="${nuxeo-platform-collectionobjects_common}/build.xml" target="dist_installer" inheritall="false"/>\r
+        <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="dist_installer" inheritall="false"/>\r
         <ant antfile="${nuxeo-platform-collectionobject-core}/build.xml" target="dist_installer" inheritall="false"/>\r
         <ant antfile="${nuxeo-platform-collectionobject-hearst}/build.xml" target="dist_installer" inheritall="false"/>\r
     </target>\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/build.xml
index 5ea651d086817730179aba3e3d85b8ed18112ed9..4a43b5e328bdaaf07dd5ad1e8f94bda0ee16a5ba 100644 (file)
--- 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"/>\r
     <property name="dist"  location="dist"/>\r
     <property name="nuxeo.collectionobject.jar"\r
-        value="org.collectionspace.services.collectionobject.CollectionObjectTenant1.nuxeo-${cspace.release}.jar"/>\r
+        value="org.collectionspace.services.collectionobject.3rdparty.CollectionObjectTenant1.nuxeo-${cspace.release}.jar"/>\r
     <property name="nuxeo.collectionobject.jars.all"\r
-        value="org.collectionspace.services.collectionobject.CollectionObjectTenant1.nuxeo-*.jar"/>\r
+        value="org.collectionspace.services.collectionobject.3rdparty.CollectionObjectTenant1.nuxeo-*.jar"/>\r
 \r
     <condition property="osfamily-unix">\r
         <os family="unix" />\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-core/pom.xml
index 183a03700dcc92068a6f47394bc113f514dcaece..76eb93c81a25aeada788ca4abce816bc738b4764 100644 (file)
--- 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 6f383736e78125cfd6be1fcf3e9a11fe9fd2052d..4448992a32199bdd2952d5da46e66134936a97cc 100644 (file)
--- 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"/>\r
     <property name="dist"  location="dist"/>\r
     <property name="nuxeo.collectionobject.jar"\r
-        value="org.collectionspace.services.collectionobject.CollectionObjectTenant2.nuxeo-${cspace.release}.jar"/>\r
+        value="org.collectionspace.services.collectionobject.3rdparty.CollectionObjectTenant2.nuxeo-${cspace.release}.jar"/>\r
     <property name="nuxeo.collectionobject.jars.all"\r
-        value="org.collectionspace.services.collectionobject.CollectionObjectTenant2.nuxeo-*.jar"/>\r
+        value="org.collectionspace.services.collectionobject.3rdparty.CollectionObjectTenant2.nuxeo-*.jar"/>\r
 \r
     <condition property="osfamily-unix">\r
         <os family="unix" />\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/pom.xml
index af484acfdef895101bea0a885c649e9e9800aace..bbb8f09c54a94ee49390572d720afa60599051a4 100644 (file)
--- 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 1df4e901c0a449dccf28459a4882cd606dc448ae..ac93534b1120f942111048cacce96f876e64bcc9 100644 (file)
--- 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"/>\r
     <property name="dist"  location="dist"/>\r
     <property name="nuxeo.collectionobject.jar"\r
-        value="org.collectionspace.services.collectionobject.collectionobjects_common.nuxeo-${cspace.release}.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.collectionobjects_common.nuxeo-*.jar"/>\r
+        value="org.collectionspace.services.collectionobject.*.jar"/>\r
 \r
     <condition property="osfamily-unix">\r
         <os family="unix" />\r

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 b711ec2fe6641b552a7b6cf30bbe880f20c2ccb6..5e929e3e625af85d02b9a2d88223ae6f92a4c1c1 100644 (file)
--- 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 ed75b9eee68e571b08b6d96ce7767e99caad03fb..01f759aec4e492d544fd3fb91666b1d221738313 100644 (file)
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -18,7 +18,7 @@
     </description>\r
 \r
     <modules>\r
-       <module>nuxeo-platform-collectionobjects_common</module>\r
+       <module>nuxeo-platform-collectionobject</module>\r
                <module>nuxeo-platform-collectionobject-core</module>\r
         <module>nuxeo-platform-collectionobject-hearst</module>\r
     </modules>\r