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 507a0f27b278c187799d1f8e843a94c22b65b811..6de53b6db7a01d945eb3fb7ea980da398d6f1403 100644 (file)
--- a/services/collectionobject/3rdparty/build.xml
+++ b/services/collectionobject/3rdparty/build.xml
@@ -9,7 +9,7 @@
     <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
        <property name="nuxeo-platform-collectionobject" value="nuxeo-platform-collectionobject"/>\r
-       <property name="nuxeo-platform-collectionobject-hearst" value="nuxeo-platform-collectionobject-hearst"/>\r
+       <property name="nuxeo-platform-collectionobject-lifesci" value="nuxeo-platform-collectionobject-lifesci"/>\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r
     <property name="build" location="build"/>\r
@@ -115,25 +115,25 @@
     <target name="deploy" depends="install"\r
     description="deploy collectionobject in ${jboss.server.nuxeo}">\r
         <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="deploy" inheritall="false"/>\r
-        <ant antfile="${nuxeo-platform-collectionobject-hearst}/build.xml" target="deploy" inheritall="false"/>\r
+        <ant antfile="${nuxeo-platform-collectionobject-lifesci}/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-collectionobject}/build.xml" target="undeploy" inheritall="false"/>\r
-        <ant antfile="${nuxeo-platform-collectionobject-hearst}/build.xml" target="undeploy" inheritall="false"/>\r
+        <ant antfile="${nuxeo-platform-collectionobject-lifesci}/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-collectionobject}/build.xml" target="dist" inheritall="false"/>\r
-        <ant antfile="${nuxeo-platform-collectionobject-hearst}/build.xml" target="dist" inheritall="false"/>\r
+        <ant antfile="${nuxeo-platform-collectionobject-lifesci}/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-collectionobject}/build.xml" target="dist_installer" inheritall="false"/>\r
-        <ant antfile="${nuxeo-platform-collectionobject-hearst}/build.xml" target="dist_installer" inheritall="false"/>\r
+        <ant antfile="${nuxeo-platform-collectionobject-lifesci}/build.xml" target="dist_installer" inheritall="false"/>\r
     </target>\r
 \r
 </project>\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
similarity index 94%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/build.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
index 4448992a32199bdd2952d5da46e66134936a97cc..272b5b079e951db751684de3f972bc4477b84d5e 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
@@ -1,7 +1,7 @@
 \r
-<project name="nuxeo-platform-collectionobject-hearst" default="package" basedir=".">\r
+<project name="nuxeo-platform-collectionobject-lifesci" default="package" basedir=".">\r
     <description>\r
-        Collectionobject nuxeo document type for the Hearst tenant\r
+        Collectionobject nuxeo document type for the lifesci tenant\r
     </description>\r
     <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../../.."/>\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/pom.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/META-INF/MANIFEST.MF b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/META-INF/MANIFEST.MF
similarity index 67%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/META-INF/MANIFEST.MF
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/META-INF/MANIFEST.MF
index cd9e64ee84d70b64127115ed16a55a310b785b5b..8e76036b082d1ff89d0efa02edeba2b42ad7c885 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0 \r
 Bundle-ManifestVersion: 1 \r
-Bundle-Name: org.collectionspace.collectionobjecttenant2\r
-Bundle-SymbolicName: org.collectionspace.collectionobjecttenant2;singleton:=true \r
+Bundle-Name: org.collectionspace.collectionobject.lifesci\r
+Bundle-SymbolicName: org.collectionspace.collectionobject.lifesci;singleton:=true \r
 Bundle-Version: 1.0.0\r
 Bundle-Localization: plugin\r
 Bundle-Vendor: Nuxeo \r
@@ -11,7 +11,7 @@ Require-Bundle: org.nuxeo.runtime,
  org.nuxeo.ecm.webapp.core,\r
  org.collectionspace.collectionspace_core,\r
  org.collectionspace.collectionobject\r
-Provide-Package: org.collectionspace.collectionobjecttenant2\r
+Provide-Package: org.collectionspace.collectionobject.lifesci\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/life-cycle-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/OSGI-INF/core-types-contrib.xml
similarity index 90%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/OSGI-INF/core-types-contrib.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/OSGI-INF/core-types-contrib.xml
index cb535a749fe7f7972dc174d566b708046f1fe3c6..f099f6468d42d6dd1ec05213a4e0c42fd840e28c 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<component name="org.collectionspace.CollectionObjectTenant2.coreTypes">
+<component name="org.collectionspace.collectionobject.lifesci.coreTypes">
     <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
         <schema name="collectionobjects_naturalhistory" prefix="collectionobjects_naturalhistory" src="schemas/collectionobjects_naturalhistory.xsd"/>
     </extension>

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/OSGI-INF/deployment-fragment.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/OSGI-INF/deployment-fragment.xml
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/OSGI-INF/deployment-fragment.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/OSGI-INF/deployment-fragment.xml

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/OSGI-INF/ecm-types-contrib.xml
similarity index 85%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/OSGI-INF/ecm-types-contrib.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index 736cb14a075ce09b7ec68abb5679f926ab5055d9..c7a94377a1caf9ca92b9791dc3c367aa56b626d7 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<component name="org.collectionspace.CollectionObjectTenant2.ecm.types">
+<component name="org.collectionspace.collectionobject.lifesci.ecm.types">
   <extension target="org.nuxeo.ecm.platform.types.TypeService" point="types">
   
     <type id="CollectionObjectTenant2" coretype="CollectionObjectTenant2">
@@ -10,7 +10,7 @@
       <layouts mode="any">
         <layout>heading</layout>
         <layout>collectionspace_core</layout>
-        <layout>CollectionObjectTenant2</layout>
+        <layout>collectionobjects_naturalhistory</layout>
       </layouts>        
     </type>
 

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/OSGI-INF/layouts-contrib.xml
similarity index 85%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/OSGI-INF/layouts-contrib.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/OSGI-INF/layouts-contrib.xml
index b32593054e3a210eefde61a2e259d5723bf4c032..a7a973b5e96f690129a41e9e1dcbb26cb625f8c8 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 
-<component name="org.collectionspace.CollectionObjectTenant2.layouts.webapp">
+<component name="org.collectionspace.collectionobjects_naturalhistory.layouts.webapp">
 
   <extension target="org.nuxeo.ecm.platform.forms.layout.WebLayoutManager"
     point="layouts">
 
-    <layout name="CollectionObjectTenant2">
+    <layout name="collectionobjects_naturalhistory">
        <!--
       <templates>
         <template mode="any">/layouts/layout_default_template.xhtml</template>

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/OSGI-INF/life-cycle-contrib.xml
similarity index 68%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/OSGI-INF/life-cycle-contrib.xml
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/OSGI-INF/life-cycle-contrib.xml
index 12688b12e3c9318c96bccd56a4e41dc6bc2228f4..63b0e6c95810895d109884d1d4be9babc734b001 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/OSGI-INF/life-cycle-contrib.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/OSGI-INF/life-cycle-contrib.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<component name="org.collectionspace.CollectionObjectTenant2.ecm.platform.LifeCycleManagerExtensions">
+<component name="org.collectionspace.collectionobject.lifesci.ecm.platform.LifeCycleManagerExtensions">
 
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/schemas/collectionobjects_naturalhistory.xsd b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/schemas/collectionobjects_naturalhistory.xsd
similarity index 100%
rename from services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/src/main/resources/schemas/collectionobjects_naturalhistory.xsd
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/schemas/collectionobjects_naturalhistory.xsd

diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml
index 43bf743760a22b36d2ff083acff72a749b6ead82..27e3e033f37fbbba00ba20e8e7409d27df99d80c 100644 (file)
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -19,7 +19,7 @@
 \r
     <modules>\r
        <module>nuxeo-platform-collectionobject</module>\r
-        <module>nuxeo-platform-collectionobject-hearst</module>\r
+        <module>nuxeo-platform-collectionobject-lifesci</module>\r
     </modules>\r
 \r
 </project>\r