From: Richard Millet <richard.millet@berkeley.edu>
Date: Fri, 17 Jun 2011 23:08:55 +0000 (+0000)
Subject: CSPACE-3441: Updating CollectionObject doctype/bundle module names to better reflect... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=501446e7bae114d153467521d3a2864192c9ef61;p=tmp%2Fjakarta-migration.git

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

diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
index 507a0f27b..6de53b6db 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-collectionobject" value="nuxeo-platform-collectionobject"/>
-	<property name="nuxeo-platform-collectionobject-hearst" value="nuxeo-platform-collectionobject-hearst"/>
+	<property name="nuxeo-platform-collectionobject-lifesci" value="nuxeo-platform-collectionobject-lifesci"/>
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
     <property name="build" location="build"/>
@@ -115,25 +115,25 @@
     <target name="deploy" depends="install"
     description="deploy collectionobject in ${jboss.server.nuxeo}">
         <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="deploy" inheritall="false"/>
-        <ant antfile="${nuxeo-platform-collectionobject-hearst}/build.xml" target="deploy" inheritall="false"/>
+        <ant antfile="${nuxeo-platform-collectionobject-lifesci}/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
     description="undeploy collectionobject from ${jboss.server.nuxeo}">
         <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="undeploy" inheritall="false"/>
-        <ant antfile="${nuxeo-platform-collectionobject-hearst}/build.xml" target="undeploy" inheritall="false"/>
+        <ant antfile="${nuxeo-platform-collectionobject-lifesci}/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
     <target name="dist"
     description="generate distribution for collectionobject" depends="package">
         <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="dist" inheritall="false"/>
-        <ant antfile="${nuxeo-platform-collectionobject-hearst}/build.xml" target="dist" inheritall="false"/>
+        <ant antfile="${nuxeo-platform-collectionobject-lifesci}/build.xml" target="dist" inheritall="false"/>
     </target>
 
     <target name="dist_installer"
     description="generate distribution for collectionobject" depends="package">
         <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="dist_installer" inheritall="false"/>
-        <ant antfile="${nuxeo-platform-collectionobject-hearst}/build.xml" target="dist_installer" inheritall="false"/>
+        <ant antfile="${nuxeo-platform-collectionobject-lifesci}/build.xml" target="dist_installer" inheritall="false"/>
     </target>
 
 </project>
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 4448992a3..272b5b079 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-hearst/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
@@ -1,7 +1,7 @@
 
-<project name="nuxeo-platform-collectionobject-hearst" default="package" basedir=".">
+<project name="nuxeo-platform-collectionobject-lifesci" default="package" basedir=".">
     <description>
-        Collectionobject nuxeo document type for the Hearst tenant
+        Collectionobject nuxeo document type for the lifesci tenant
     </description>
     <!-- set global properties for this build -->
     <property name="services.trunk" value="../../../.."/>
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 cd9e64ee8..8e76036b0 100644
--- 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 
 Bundle-ManifestVersion: 1 
-Bundle-Name: org.collectionspace.collectionobjecttenant2
-Bundle-SymbolicName: org.collectionspace.collectionobjecttenant2;singleton:=true 
+Bundle-Name: org.collectionspace.collectionobject.lifesci
+Bundle-SymbolicName: org.collectionspace.collectionobject.lifesci;singleton:=true 
 Bundle-Version: 1.0.0
 Bundle-Localization: plugin
 Bundle-Vendor: Nuxeo 
@@ -11,7 +11,7 @@ Require-Bundle: org.nuxeo.runtime,
  org.nuxeo.ecm.webapp.core,
  org.collectionspace.collectionspace_core,
  org.collectionspace.collectionobject
-Provide-Package: org.collectionspace.collectionobjecttenant2
+Provide-Package: org.collectionspace.collectionobject.lifesci
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,
  OSGI-INF/life-cycle-contrib.xml,
  OSGI-INF/ecm-types-contrib.xml,
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 cb535a749..f099f6468 100644
--- 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 736cb14a0..c7a94377a 100644
--- 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 b32593054..a7a973b5e 100644
--- 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 12688b12e..63b0e6c95 100644
--- 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 43bf74376..27e3e033f 100644
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -19,7 +19,7 @@
 
     <modules>
     	<module>nuxeo-platform-collectionobject</module>
-        <module>nuxeo-platform-collectionobject-hearst</module>
+        <module>nuxeo-platform-collectionobject-lifesci</module>
     </modules>
 
 </project>