From 5c034ae99b34d542d9aa113f612d1f31a3571fc9 Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Mon, 1 Aug 2011 20:51:28 +0000
Subject: [PATCH] CSPACE-4232: Consolidating Nuxeo document type "boiler plate"
 settings/config files into top-level 3rdparty directory.

---
 .../src/main/resources/META-INF/MANIFEST.MF   | 18 ++++++++++
 .../resources/OSGI-INF/core-types-contrib.xml | 15 ++++++++
 .../resources/OSGI-INF/ecm-types-contrib.xml  | 29 +++++++++++++++
 .../resources/OSGI-INF/layouts-contrib.xml    | 33 +++++++++++++++++
 .../resources/OSGI-INF/life-cycle-contrib.xml | 10 ++++++
 build.properties                              | 35 +++++++++----------
 .../pom.xml                                   | 22 +++++++++++-
 .../nuxeo-platform-collectionobject/pom.xml   |  6 ----
 .../resources/OSGI-INF/layouts-contrib.xml    | 22 ++++++------
 services/collectionobject/3rdparty/pom.xml    |  7 ++++
 10 files changed, 161 insertions(+), 36 deletions(-)
 create mode 100644 3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/META-INF/MANIFEST.MF
 create mode 100644 3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/core-types-contrib.xml
 create mode 100644 3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/ecm-types-contrib.xml
 create mode 100644 3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/layouts-contrib.xml
 create mode 100644 3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/life-cycle-contrib.xml

diff --git a/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/META-INF/MANIFEST.MF b/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..8fa6e5589
--- /dev/null
+++ b/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0 
+Bundle-ManifestVersion: 1 
+Bundle-Name: org.collectionspace.${ServiceName}.${TenantLabel}
+Bundle-SymbolicName: org.collectionspace.${ServiceName}.${TenantLabel};singleton:=true 
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Bundle-Vendor: Nuxeo 
+Require-Bundle: org.nuxeo.runtime, 
+ org.nuxeo.ecm.core.api,
+ org.nuxeo.ecm.core,
+ org.nuxeo.ecm.webapp.core,
+ org.collectionspace.collectionspace_core,
+ org.collectionspace.${ServiceName}
+Provide-Package: org.collectionspace.${ServiceName}.${TenantLabel}
+Nuxeo-Component: OSGI-INF/core-types-contrib.xml,
+ OSGI-INF/life-cycle-contrib.xml,
+ OSGI-INF/ecm-types-contrib.xml,
+ OSGI-INF/layouts-contrib.xml
diff --git a/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/core-types-contrib.xml b/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/core-types-contrib.xml
new file mode 100644
index 000000000..3c8e366e6
--- /dev/null
+++ b/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<component name="org.collectionspace.${ServiceName}.${TenantLabel}.coreTypes">
+	<extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
+		<schema name="${CustomSchemaName}" prefix="${CustomSchemaName}" src="schemas/${CustomSchemaName}.xsd"/>
+	</extension>
+	<extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
+		<doctype name="${NuxeoDocTypeName}${TenantPrefix}${TenantId}" extends="${NuxeoDocTypeName}">
+			<schema name="common"/>
+			<schema name="dublincore"/>
+			<schema name="collectionspace_core"/>
+			<schema name="${CommonSchemaName}"/>
+			<schema name="${CustomSchemaName}"/>
+		</doctype>
+	</extension>
+	</component>
diff --git a/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/ecm-types-contrib.xml
new file mode 100644
index 000000000..aa0ce29d8
--- /dev/null
+++ b/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<component name="org.collectionspace.${ServiceName}.${TenantLabel}.ecm.types">
+  <extension target="org.nuxeo.ecm.platform.types.TypeService" point="types">
+    <type id="${NuxeoDocTypeName}${TenantPrefix}${TenantId}" coretype="${NuxeoDocTypeName}${TenantPrefix}${TenantId}">
+      <label>org.collectionspace.${NuxeoDocTypeName}${TenantPrefix}${TenantId}</label>
+      <!--icon>/icons/file.gif</icon-->
+      <default-view>view_documents</default-view>
+
+      <layouts mode="any">
+        <layout>heading</layout>
+        <layout>collectionspace_core</layout>
+        <layout>${CommonSchemaName}</layout>
+		<layout>${CustomSchemaName}</layout>
+      </layouts>
+    </type>
+
+    <type id="Folder" coretype="Folder">
+      <subtypes>
+        <type>"${NuxeoDocTypeName}${TenantPrefix}${TenantId}"</type>
+      </subtypes>
+    </type>
+    
+    <type id="Workspace" coretype="Workspace">
+      <subtypes>
+        <type>"${NuxeoDocTypeName}${TenantPrefix}${TenantId}"</type>
+      </subtypes>
+    </type>
+  </extension>
+</component>
diff --git a/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/layouts-contrib.xml b/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/layouts-contrib.xml
new file mode 100644
index 000000000..f6bd8a7ad
--- /dev/null
+++ b/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<component name="org.collectionspace.${CustomSchemaName}.layouts.webapp">
+
+  <extension target="org.nuxeo.ecm.platform.forms.layout.WebLayoutManager"
+    point="layouts">
+
+    <layout name="${CustomSchemaName}">
+	<!-- Insert layout settings for the custom schema here. -->
+	<!--
+      <templates>
+        <template mode="any">/layouts/layout_default_template.xhtml</template>
+      </templates>
+      <rows>
+        <row><widget>exampleField</widget></row>
+      </rows>
+
+      <widget name="exampleField" type="text">
+        <labels>
+          <label mode="any">exampleField</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="${CustomSchemaName}">exampleField</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      -->
+    </layout>
+  </extension>
+</component>
diff --git a/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/life-cycle-contrib.xml
new file mode 100644
index 000000000..a03781b05
--- /dev/null
+++ b/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/life-cycle-contrib.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<component name="org.collectionspace.${ServiceName}.${TenantLabel}.ecm.platform.LifeCycleManagerExtensions">
+
+  <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService" point="types">
+    <types>
+      <type name="${NuxeoDocTypeName}${TenantPrefix}${TenantId}">default</type>
+    </types>
+  </extension>
+
+</component>
diff --git a/build.properties b/build.properties
index bfbf236d1..b75e115ef 100644
--- a/build.properties
+++ b/build.properties
@@ -69,29 +69,28 @@ nuxeo.main.config.file=${jboss.bin}/nuxeo.conf
 #database - select one or the other (not both!), and then uncomment the
 # appropriate section below the common settings
 #db=mysql|postgresql
-db=postgresql
+db=mysql
 #For mysql, uncomment this, and comment out postgres section
-#db.port=3306
-#db.driver.jar=${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar
-#db.jdbc.driver.class=com.mysql.jdbc.Driver
-#db.dialect=org.hibernate.dialect.MySQLDialect
-#db.typemapping=mySQL
-#db.exceptionsorter=org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter
-#db.spring.acl.classIdentityQuery=SELECT @@IDENTITY
-#db.spring.acl.sidIdentityQuery=SELECT @@IDENTITY
+db.port=3306
+db.driver.jar=${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar
+db.jdbc.driver.class=com.mysql.jdbc.Driver
+db.dialect=org.hibernate.dialect.MySQLDialect
+db.typemapping=mySQL
+db.exceptionsorter=org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter
+db.spring.acl.classIdentityQuery=SELECT @@IDENTITY
+db.spring.acl.sidIdentityQuery=SELECT @@IDENTITY
 
 #For postgresql, uncomment this, and comment out mysql section
-db.port=5432
-db.driver.jar=${jboss.lib.cspace}/postgresql-8.4-702.jdbc4.jar
-db.jdbc.driver.class=org.postgresql.Driver
-db.dialect=org.hibernate.dialect.PostgreSQLDialect
-db.typemapping=PostgreSQL 8.0
+#db.port=5432
+#db.driver.jar=${jboss.lib.cspace}/postgresql-8.4-702.jdbc4.jar
+#db.jdbc.driver.class=org.postgresql.Driver
+#db.dialect=org.hibernate.dialect.PostgreSQLDialect
+#db.typemapping=PostgreSQL 8.0
 # Should be org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter
 # but current JBoss does not seem to include it...
-db.exceptionsorter= 
-db.spring.acl.classIdentityQuery=select currval(pg_get_serial_sequence('acl_class', 'id'))
-db.spring.acl.sidIdentityQuery=select currval(pg_get_serial_sequence('acl_sid', 'id'))
-
+#db.exceptionsorter= 
+#db.spring.acl.classIdentityQuery=select currval(pg_get_serial_sequence('acl_class', 'id'))
+#db.spring.acl.sidIdentityQuery=select currval(pg_get_serial_sequence('acl_sid', 'id'))
 
 #database common settings
 db.script.dir=${jboss.server.cspace}/cspace/services/db/${db}
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml
index fae212afc..cbf226cd8 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml
@@ -15,14 +15,34 @@
         CollectionObject Nuxeo document type for Tenant ID = "2"
     </description>
 
+	<properties>
+		<CustomSchemaName>collectionobjects_naturalhistory</CustomSchemaName>
+		<TenantId>2</TenantId>
+		<TenantLabel>lifesci</TenantLabel>
+	</properties>
+	
     <build>
+		<resources>
+		  <resource>
+			<directory>../../../../3rdparty/nuxeo/nuxeo-doctype/src/main/resources</directory>
+			<filtering>true</filtering>
+		  </resource>
+		  <resource>
+			<directory>../../../../3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources</directory>
+			<filtering>true</filtering>
+		  </resource>
+		  <resource>
+			<directory>src/main/resources</directory>
+			<filtering>true</filtering>
+		  </resource>
+		</resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
-                        <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
+                        <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
                         <manifestEntries>
                             <Bundle-Version>${eclipseVersion}</Bundle-Version>
                             <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/pom.xml
index 36c527efb..c61477036 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/pom.xml
@@ -14,12 +14,6 @@
     <description>
         CollectionObject Common Nuxeo document type
     </description>
-
-	<properties>
-		<ServiceName>collectionobject</ServiceName>
-		<NuxeoDocTypeName>CollectionObject</NuxeoDocTypeName>
-		<CommonSchemaName>collectionobjects_common</CommonSchemaName>
-	</properties>
     
     <build>
 		<resources>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml
index c53e7d2d2..752774a60 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
-<component name="org.collectionspace.collectionobject.layouts.webapp">
+<component name="org.collectionspace.${ServiceName}.layouts.webapp">
 
   <extension target="org.nuxeo.ecm.platform.forms.layout.WebLayoutManager"
     point="layouts">
 
-    <layout name="collectionobjects_common">
+    <layout name="${CommonSchemaName}">
       <templates>
         <template mode="any">/layouts/layout_default_template.xhtml</template>
       </templates>
@@ -41,7 +41,7 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="collectionobjects_common">objectNumber</field>
+          <field schema="${CommonSchemaName}">objectNumber</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
@@ -54,7 +54,7 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="collectionobjects_common">otherNumber</field>
+          <field schema="${CommonSchemaName}">otherNumber</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
@@ -67,7 +67,7 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="collectionobjects_common">otherNumberType</field>
+          <field schema="${CommonSchemaName}">otherNumberType</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
@@ -80,7 +80,7 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="collectionobjects_common">briefDescription</field>
+          <field schema="${CommonSchemaName}">briefDescription</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
@@ -93,7 +93,7 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="collectionobjects_common">comments</field>
+          <field schema="${CommonSchemaName}">comments</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
@@ -107,7 +107,7 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="collectionobjects_common">distinguishingFeatures</field>
+          <field schema="${CommonSchemaName}">distinguishingFeatures</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
@@ -120,7 +120,7 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="collectionobjects_common">objectName</field>
+          <field schema="${CommonSchemaName}">objectName</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
@@ -133,7 +133,7 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="collectionobjects_common">responsibleDepartment</field>
+          <field schema="${CommonSchemaName}">responsibleDepartment</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
@@ -148,7 +148,7 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="collectionobjects_common">title</field>
+          <field schema="${CommonSchemaName}">title</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml
index 2fbeedb63..edabb6d30 100644
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -17,6 +17,13 @@
         3rd party build for collectionobject service
     </description>
 
+	<properties>
+		<ServiceName>collectionobject</ServiceName>
+		<NuxeoDocTypeName>CollectionObject</NuxeoDocTypeName>	
+		<CommonSchemaName>collectionobjects_common</CommonSchemaName>
+		<TenantPrefix>Tenant</TenantPrefix>
+	</properties>
+	
     <modules>
     	<module>nuxeo-platform-collectionobject</module>
         <module>nuxeo-platform-collectionobject-lifesci</module>
-- 
2.47.3