From a261e2bacfc43d9408cbef0e9ad1120399d5f673 Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Fri, 17 Jun 2011 05:18:21 +0000
Subject: [PATCH] CSPACE-3441: Added final support in the Services core for
 tenant specifc document types.

---
 services/collectionobject/3rdparty/build.xml  |  19 ++-
 .../build.xml                                 | 151 +++++++++++++++++
 .../pom.xml                                   |  37 ++++
 .../src/main/resources/META-INF/MANIFEST.MF   |  17 ++
 .../resources/OSGI-INF/core-types-contrib.xml |  15 ++
 .../OSGI-INF/deployment-fragment.xml          |  10 ++
 .../resources/OSGI-INF/ecm-types-contrib.xml  |  28 +++
 .../resources/OSGI-INF/layouts-contrib.xml    | 160 ++++++++++++++++++
 .../resources/OSGI-INF/life-cycle-contrib.xml |   9 +
 .../schemas/collectionobjects_common.xsd      |   4 +-
 .../build.xml                                 |   4 +-
 .../pom.xml                                   |   9 +-
 .../src/main/resources/META-INF/MANIFEST.MF   |   9 +-
 .../resources/OSGI-INF/core-types-contrib.xml |  13 +-
 .../resources/OSGI-INF/ecm-types-contrib.xml  |  13 +-
 .../resources/OSGI-INF/layouts-contrib.xml    | 145 +---------------
 .../resources/OSGI-INF/life-cycle-contrib.xml |   4 +-
 .../collectionobjects_naturalhistory.xsd      | 143 ----------------
 services/collectionobject/3rdparty/pom.xml    |   4 +-
 .../context/AbstractServiceContextImpl.java   |  15 ++
 .../common/context/ServiceContext.java        |  15 ++
 .../services/common/query/QueryContext.java   |   4 +-
 .../client/java/RepositoryJavaClientImpl.java |  16 +-
 .../services/nuxeo/util/NuxeoUtils.java       |  70 +++++++-
 24 files changed, 582 insertions(+), 332 deletions(-)
 create mode 100644 services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/build.xml
 create mode 100644 services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/pom.xml
 create mode 100644 services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/META-INF/MANIFEST.MF
 create mode 100644 services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/core-types-contrib.xml
 create mode 100644 services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/deployment-fragment.xml
 create mode 100644 services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/ecm-types-contrib.xml
 create mode 100644 services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/layouts-contrib.xml
 create mode 100644 services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/life-cycle-contrib.xml
 rename services/collectionobject/3rdparty/{nuxeo-platform-cs-collectionobject => nuxeo-platform-collectionobjects_common}/src/main/resources/schemas/collectionobjects_common.xsd (97%)
 delete mode 100644 services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_naturalhistory.xsd

diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
index b3c70a12a..de0e27d3c 100644
--- a/services/collectionobject/3rdparty/build.xml
+++ b/services/collectionobject/3rdparty/build.xml
@@ -8,6 +8,9 @@
      <!-- enviornment should be declared before reading build.properties -->
     <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-hearst" value="nuxeo-platform-collectionobject-hearst"/>
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
     <property name="build" location="build"/>
@@ -112,22 +115,30 @@
 
     <target name="deploy" depends="install"
     description="deploy collectionobject in ${jboss.server.nuxeo}">
-        <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="deploy" inheritall="false"/>
+        <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-hearst}/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
     description="undeploy collectionobject from ${jboss.server.nuxeo}">
-        <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="undeploy" inheritall="false"/>
+        <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-hearst}/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
     <target name="dist"
     description="generate distribution for collectionobject" depends="package">
-        <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="dist" inheritall="false"/>
+        <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-hearst}/build.xml" target="dist" inheritall="false"/>
     </target>
 
     <target name="dist_installer"
     description="generate distribution for collectionobject" depends="package">
-        <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="dist_installer" inheritall="false"/>
+        <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-hearst}/build.xml" target="dist_installer" inheritall="false"/>
     </target>
 
 </project>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/build.xml
new file mode 100644
index 000000000..1df4e901c
--- /dev/null
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/build.xml
@@ -0,0 +1,151 @@
+
+<project name="nuxeo-platform-collectionobjects_common" default="package" basedir=".">
+    <description>
+        CollectionobjectsCommon Nuxeo document type
+    </description>
+    <!-- set global properties for this build -->
+    <property name="services.trunk" value="../../../.."/>
+    <!-- environment should be declared before reading build.properties -->
+    <property environment="env" />
+    <property file="${services.trunk}/build.properties" />
+    <property name="mvn.opts" value="" />
+    <property name="src" location="src"/>
+    <property name="build" location="build"/>
+    <property name="dist"  location="dist"/>
+    <property name="nuxeo.collectionobject.jar"
+        value="org.collectionspace.services.collectionobject.collectionobjects_common.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.collectionobject.jars.all"
+        value="org.collectionspace.services.collectionobject.collectionobjects_common.nuxeo-*.jar"/>
+
+    <condition property="osfamily-unix">
+        <os family="unix" />
+    </condition>
+    <condition property="osfamily-windows">
+        <os family="windows" />
+    </condition>
+
+    <target name="init" >
+        <!-- Create the time stamp -->
+        <tstamp/>
+        <!-- Create the build directory structure used by compile -->
+        <mkdir dir="${build}"/>
+    </target>
+
+    <target name="package" depends="package-unix,package-windows"
+        description="Package CollectionSpace Services" />
+    <target name="package-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="package-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="install" depends="install-unix,install-windows"
+  description="Install" />
+    <target name="install-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="install" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="install-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="install" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    
+    <target name="clean" depends="clean-unix,clean-windows"
+        description="Delete target directories" >
+        <delete dir="${build}"/>
+    </target>
+    <target name="clean-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="clean-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="test" depends="test-unix,test-windows" description="Run tests" />
+    <target name="test-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="test-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="deploy" depends="install"
+        description="Deploy CollectionObjectsCommon doctype in ${jboss.server.nuxeo}">
+        <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"
+        todir="${jboss.deploy.nuxeo.plugins}"/>
+    </target>
+
+    <target name="undeploy"
+        description="Undeploy CollectionObjectsCommon doctype from ${jboss.server.nuxeo}">
+        <delete>
+            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.collectionobject.jars.all}"/>
+            </fileset>
+            <!-- Legacy deployment location through release 0.6 -->
+            <fileset dir="${jboss.deploy.nuxeo.system}">
+                <include name="${nuxeo.collectionobject.jars.all}"/>
+            </fileset>
+        </delete>
+    </target>
+
+    <target name="dist"
+    	description="generate distribution for collectionobject doctype" depends="package">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
+            <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>
+        </copy>
+    </target>
+
+    <target name="dist_installer"
+    	description="Creates an installer distribution for CollectionObjectsCommon doctype" depends="package">
+        <copy todir="${services.trunk}/${dist.installer.services}/collectionobject/nuxeo">
+            <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>
+        </copy>
+    </target>
+</project>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/pom.xml
new file mode 100644
index 000000000..b711ec2fe
--- /dev/null
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/pom.xml
@@ -0,0 +1,37 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.collectionspace.services</groupId>
+        <artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>
+        <version>1.8-SNAPSHOT</version>
+    </parent>
+    
+    <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>
+    <packaging>jar</packaging>
+    <description>
+        CollectionObject Common Nuxeo document type
+    </description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
+                        <manifestEntries>
+                            <Bundle-Version>${eclipseVersion}</Bundle-Version>
+                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/META-INF/MANIFEST.MF b/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..d1b213446
--- /dev/null
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0 
+Bundle-ManifestVersion: 1 
+Bundle-Name: org.collectionspace.collectionobject
+Bundle-SymbolicName: org.collectionspace.collectionobject;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
+Provide-Package: org.collectionspace.collectionobject
+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/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/core-types-contrib.xml
new file mode 100644
index 000000000..21ae46491
--- /dev/null
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<component name="org.collectionspace.collectionobject.coreTypes">
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
+        <schema name="collectionobjects_common" prefix="collectionobjects_common" src="schemas/collectionobjects_common.xsd"/>
+    </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
+        <doctype name="CollectionObject" extends="CollectionSpaceDocument">
+            <prefetch>
+                collectionobjects_common:objectNumber
+                collectionobjects_common:objectNameList
+                collectionobjects_common:responsibleDepartments
+			</prefetch>
+        </doctype>
+    </extension>
+</component>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/deployment-fragment.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/deployment-fragment.xml
new file mode 100644
index 000000000..06404c6a0
--- /dev/null
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/deployment-fragment.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<fragment>
+
+  <extension target="application#MODULE">
+    <module>
+      <java>${bundle.fileName}</java>
+    </module>
+  </extension>
+
+</fragment>
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-collectionobjects_common/src/main/resources/OSGI-INF/ecm-types-contrib.xml
new file mode 100644
index 000000000..14b98e49b
--- /dev/null
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<component name="org.collectionspace.collectionobject.ecm.types">
+  <extension target="org.nuxeo.ecm.platform.types.TypeService" point="types">
+    <type id="CollectionObject" coretype="CollectionObject">
+      <label>org.collectionspace.collectionobject</label>
+      <!--icon>/icons/file.gif</icon-->
+      <default-view>view_documents</default-view>
+
+      <layouts mode="any">
+        <layout>heading</layout>
+        <layout>collectionspace_core</layout>
+        <layout>collectionobjects_common</layout>
+      </layouts>        
+    </type>
+
+    <type id="Folder" coretype="Folder">
+      <subtypes>
+        <type>CollectionObject</type>
+      </subtypes>
+    </type>
+    
+    <type id="Workspace" coretype="Workspace">
+      <subtypes>
+        <type>CollectionObject</type>
+      </subtypes>
+    </type>
+  </extension>
+</component>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/layouts-contrib.xml
new file mode 100644
index 000000000..c53e7d2d2
--- /dev/null
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0"?>
+<component name="org.collectionspace.collectionobject.layouts.webapp">
+
+  <extension target="org.nuxeo.ecm.platform.forms.layout.WebLayoutManager"
+    point="layouts">
+
+    <layout name="collectionobjects_common">
+      <templates>
+        <template mode="any">/layouts/layout_default_template.xhtml</template>
+      </templates>
+      <rows>
+        <row><widget>objectNumber</widget></row>
+        <row><widget>otherNumber</widget></row>
+        <row><widget>otherNumberType</widget></row>
+        <!-- Repeatable fields are commented out for now until we -->
+        <!-- identify how to represent these complex types in layouts. -->
+        <!-- <row><widget>entryMethod</widget></row> -->
+        <!--<row><widget>briefDescription</widget></row>-->
+        <!--<row><widget>comments</widget></row>-->
+        <row><widget>distinguishingFeatures</widget></row>
+        <row><widget>numberOfObjects</widget></row>
+        
+        <row><widget>objectName</widget></row>
+        <row><widget>objectNameCurrency</widget></row>
+        <row><widget>objectNameLevel</widget></row>
+        <row><widget>objectNameNote</widget></row>
+        <row><widget>objectNameSystem</widget></row>
+        <row><widget>objectNameType</widget></row>
+        <row><widget>objectNameLanguage</widget></row>
+        
+        <!--<row><widget>responsibleDepartment</widget></row>-->
+        <row><widget>title</widget></row>
+        <row><widget>objectTitleLanguage</widget></row>
+        <row><widget>titleTranslation</widget></row>
+        <row><widget>titleType</widget></row>
+      </rows>
+
+      <widget name="objectNumber" type="text">
+        <labels>
+          <label mode="any">objectNumber</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="collectionobjects_common">objectNumber</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="otherNumber" type="text">
+        <labels>
+          <label mode="any">otherNumber</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="collectionobjects_common">otherNumber</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="otherNumberType" type="text">
+        <labels>
+          <label mode="any">otherNumberType</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="collectionobjects_common">otherNumberType</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+<!--
+      <widget name="briefDescription" type="text">
+        <labels>
+          <label mode="any">briefDescription</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="collectionobjects_common">briefDescription</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
+     <widget name="comments" type="text">
+        <labels>
+          <label mode="any">comments</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="collectionobjects_common">comments</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+-->
+
+      <widget name="distinguishingFeatures" type="text">
+        <labels>
+          <label mode="any">distinguishingFeatures</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="collectionobjects_common">distinguishingFeatures</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
+      <widget name="objectName" type="text">
+        <labels>
+          <label mode="any">objectName</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="collectionobjects_common">objectName</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+<!--
+      <widget name="responsibleDepartment" type="text">
+        <labels>
+          <label mode="any">responsibleDepartment</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="collectionobjects_common">responsibleDepartment</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
+-->
+
+      <widget name="title" type="text">
+        <labels>
+          <label mode="any">title</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="collectionobjects_common">title</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
+    </layout>
+  </extension>
+</component>
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-collectionobjects_common/src/main/resources/OSGI-INF/life-cycle-contrib.xml
new file mode 100644
index 000000000..ca558a2f6
--- /dev/null
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/OSGI-INF/life-cycle-contrib.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<component name="org.collectionspace.collectionobjects.ecm.platform.LifeCycleManagerExtensions">
+  <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
+             point="types">
+    <types>
+      <type name="CollectionObject">default</type>
+    </types>
+  </extension>
+</component>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd b/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/schemas/collectionobjects_common.xsd
similarity index 97%
rename from services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
rename to services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/schemas/collectionobjects_common.xsd
index 06605323e..3bc0d7258 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobjects_common/src/main/resources/schemas/collectionobjects_common.xsd
@@ -7,8 +7,8 @@
     Part    : Common
     Used for: Nuxeo EP core document type
 
-    $LastChangedRevision$
-    $LastChangedDate$
+    $LastChangedRevision: 4736 $
+    $LastChangedDate: 2011-05-12 17:36:23 -0700 (Thu, 12 May 2011) $
 -->
 
 
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
index a8213066f..5ea651d08 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
@@ -13,9 +13,9 @@
     <property name="build" location="build"/>
     <property name="dist"  location="dist"/>
     <property name="nuxeo.collectionobject.jar"
-        value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-${cspace.release}.jar"/>
+        value="org.collectionspace.services.collectionobject.CollectionObjectTenant1.nuxeo-${cspace.release}.jar"/>
     <property name="nuxeo.collectionobject.jars.all"
-        value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-*.jar"/>
+        value="org.collectionspace.services.collectionobject.CollectionObjectTenant1.nuxeo-*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
index 55321ff67..183a03700 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
@@ -9,11 +9,11 @@
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <artifactId>org.collectionspace.services.collectionobject.3rdparty.nuxeo</artifactId>
-    <name>services.collectionobject.3rdparty.nuxeo</name>
+    <artifactId>org.collectionspace.services.collectionobject.CollectionObjectTenant1.nuxeo</artifactId>
+    <name>services.collectionobject.CollectionObjectTenant1.nuxeo</name>
     <packaging>jar</packaging>
     <description>
-        CollectionObject Nuxeo document type
+        CollectionObject Nuxeo document type for Tenant ID = "1"
     </description>
 
     <build>
@@ -22,9 +22,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-<!--                	  <includes>
-                	  	<include>mydog.xml</include>
-                	 	</includes> -->
                     <archive>
                         <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
                         <manifestEntries>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/META-INF/MANIFEST.MF b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/META-INF/MANIFEST.MF
index 1a49e9936..97efbb62f 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0 
 Bundle-ManifestVersion: 1 
-Bundle-Name: NuxeoCS
-Bundle-SymbolicName: org.collectionspace.collectionobject;singleton:=true 
+Bundle-Name: org.collectionspace.collectionobjecttenant1
+Bundle-SymbolicName: org.collectionspace.collectionobjecttenant1;singleton:=true 
 Bundle-Version: 1.0.0
 Bundle-Localization: plugin
 Bundle-Vendor: Nuxeo 
@@ -9,8 +9,9 @@ Require-Bundle: org.nuxeo.runtime,
  org.nuxeo.ecm.core.api,
  org.nuxeo.ecm.core,
  org.nuxeo.ecm.webapp.core,
- org.collectionspace.collectionspace_core
-Provide-Package: org.collectionspace.collectionobject
+ org.collectionspace.collectionspace_core,
+ org.collectionspace.collectionobject
+Provide-Package: org.collectionspace.collectionobjecttenant1
 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-cs-collectionobject/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/core-types-contrib.xml
index ae91a1580..8dbaede9c 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -1,20 +1,11 @@
 <?xml version="1.0"?>
-<component name="org.collectionspace.collectionobject.coreTypes">
-    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-        <schema name="collectionobjects_common" prefix="collectionobjects_common" src="schemas/collectionobjects_common.xsd"/>
-        <schema name="collectionobjects_naturalhistory" prefix="collectionobjects_naturalhistory" src="schemas/collectionobjects_naturalhistory.xsd"/>
-    </extension>
+<component name="org.collectionspace.CollectionObjectTenant1.coreTypes">
     <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-        <doctype name="CollectionObject" extends="CollectionSpaceDocument">
+        <doctype name="CollectionObjectTenant1" extends="CollectionObject">
             <schema name="common"/>
             <schema name="dublincore"/>
             <schema name="collectionspace_core"/>
             <schema name="collectionobjects_common"/>
-            <schema name="collectionobjects_naturalhistory"/>
-            <prefetch>
-            collectionobjects_common:objectNumber
-            collectionobjects_common:objectNameList
-            collectionobjects_common:responsibleDepartments</prefetch>
         </doctype>
     </extension>
 </component>
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-cs-collectionobject/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index 1627222b9..cc831e163 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -1,27 +1,28 @@
 <?xml version="1.0"?>
-<component name="org.collectionspace.collectionobject.ecm.types">
+<component name="org.collectionspace.CollectionObjectTenant1.ecm.types">
   <extension target="org.nuxeo.ecm.platform.types.TypeService" point="types">
-    <type id="CollectionObject" coretype="CollectionObject">
-      <label>org.collectionspace.collectionobject</label>
+  
+    <type id="CollectionObjectTenant1" coretype="CollectionObjectTenant1">
+      <label>org.collectionspace.CollectionObjectTenant1</label>
       <!--icon>/icons/file.gif</icon-->
       <default-view>view_documents</default-view>
 
       <layouts mode="any">
         <layout>heading</layout>
         <layout>collectionspace_core</layout>
-        <layout>collectionobject</layout>
+        <layout>CollectionObjectTenant1</layout>
       </layouts>        
     </type>
 
     <type id="Folder" coretype="Folder">
       <subtypes>
-        <type>CollectionObject</type>
+        <type>"CollectionObjectTenant1"</type>
       </subtypes>
     </type>
     
     <type id="Workspace" coretype="Workspace">
       <subtypes>
-        <type>CollectionObject</type>
+        <type>"CollectionObjectTenant1"</type>
       </subtypes>
     </type>
   </extension>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml
index 0267b47a5..64369fd09 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -1,161 +1,32 @@
 <?xml version="1.0"?>
 
-<component name="org.collectionspace.collectionobject.layouts.webapp">
+<component name="org.collectionspace.CollectionObjectTenant1.layouts.webapp">
 
   <extension target="org.nuxeo.ecm.platform.forms.layout.WebLayoutManager"
     point="layouts">
 
-    <layout name="collectionobject">
+    <layout name="CollectionObjectTenant1">
+	<!--
       <templates>
         <template mode="any">/layouts/layout_default_template.xhtml</template>
       </templates>
       <rows>
-        <row><widget>objectNumber</widget></row>
-        <row><widget>otherNumber</widget></row>
-        <row><widget>otherNumberType</widget></row>
-        <!-- Repeatable fields are commented out for now until we -->
-        <!-- identify how to represent these complex types in layouts. -->
-        <!-- <row><widget>entryMethod</widget></row> -->
-        <!--<row><widget>briefDescription</widget></row>-->
-        <!--<row><widget>comments</widget></row>-->
-        <row><widget>distinguishingFeatures</widget></row>
-        <row><widget>numberOfObjects</widget></row>
-        
-        <row><widget>objectName</widget></row>
-        <row><widget>objectNameCurrency</widget></row>
-        <row><widget>objectNameLevel</widget></row>
-        <row><widget>objectNameNote</widget></row>
-        <row><widget>objectNameSystem</widget></row>
-        <row><widget>objectNameType</widget></row>
-        <row><widget>objectNameLanguage</widget></row>
-        
-        <!--<row><widget>responsibleDepartment</widget></row>-->
-        <row><widget>title</widget></row>
-        <row><widget>objectTitleLanguage</widget></row>
-        <row><widget>titleTranslation</widget></row>
-        <row><widget>titleType</widget></row>
+        <row><widget>exampleField</widget></row>
       </rows>
 
-      <widget name="objectNumber" type="text">
+      <widget name="exampleField" type="text">
         <labels>
-          <label mode="any">objectNumber</label>
+          <label mode="any">exampleField</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="collectionobjects_common">objectNumber</field>
+          <field schema="collectionobjects_naturalhistory">exampleField</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
-      
-      <widget name="otherNumber" type="text">
-        <labels>
-          <label mode="any">otherNumber</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobjects_common">otherNumber</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-      
-      <widget name="otherNumberType" type="text">
-        <labels>
-          <label mode="any">otherNumberType</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobjects_common">otherNumberType</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-<!--
-      <widget name="briefDescription" type="text">
-        <labels>
-          <label mode="any">briefDescription</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobjects_common">briefDescription</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-
-     <widget name="comments" type="text">
-        <labels>
-          <label mode="any">comments</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobjects_common">comments</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
--->
-
-      <widget name="distinguishingFeatures" type="text">
-        <labels>
-          <label mode="any">distinguishingFeatures</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobjects_common">distinguishingFeatures</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-
-      <widget name="objectName" type="text">
-        <labels>
-          <label mode="any">objectName</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobjects_common">objectName</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-<!--
-      <widget name="responsibleDepartment" type="text">
-        <labels>
-          <label mode="any">responsibleDepartment</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobjects_common">responsibleDepartment</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-
--->
-
-      <widget name="title" type="text">
-        <labels>
-          <label mode="any">title</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobjects_common">title</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-
+      -->
     </layout>
   </extension>
 </component>
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-cs-collectionobject/src/main/resources/OSGI-INF/life-cycle-contrib.xml
index 4fa5e8832..3b710368f 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/life-cycle-contrib.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/life-cycle-contrib.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
-<component name="org.collectionspace.ecm.platform.collectionobject.LifeCycleManagerExtensions">
+<component name="org.collectionspace.CollectionObjectTenant1.ecm.platform.LifeCycleManagerExtensions">
 
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="CollectionObject">default</type>
+      <type name="CollectionObjectTenant1">default</type>
     </types>
   </extension>
 
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_naturalhistory.xsd b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_naturalhistory.xsd
deleted file mode 100644
index 606f5eb4d..000000000
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_naturalhistory.xsd
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-  CollectionObject schema (XSD)
-  
-  Entity  : CollectionObject
-  Part    : Domain - Natural History (example)
-  Used for: Nuxeo EP core document type
-  
-  $LastChangedRevision$
-  $LastChangedDate$
--->
-
-<xs:schema 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:ns="http://collectionspace.org/services/collectionobject/domain/naturalhistory"
-  xmlns="http://collectionspace.org/services/collectionobject/domain/naturalhistory"
-  targetNamespace="http://collectionspace.org/services/collectionobject/domain/naturalhistory"
-  version="0.1">
-
-  <!-- used for testing
-  <xs:element name="nh-string" type="xs:string" />
-  <xs:element name="nh-int" type="xs:int"/>
-  <xs:element name="nh-long" type="xs:long"/>
-  <xs:element name="nh-date" type="xs:dateTime"/>
-  <xs:element name="nh-note" type="xs:string"/>
-  -->
-
-  <!--  These items are being moved to common
-  <xs:element name="fieldCollector" type="xs:string"/>
-  <xs:element name="fieldCollectionDate" type="xs:string"/>
-  <xs:element name="fieldLocPlace" type="xs:string"/>
-  <xs:element name="catalogDate" type="xs:string"/>
-  -->
-
-  <xs:element name="labelHeader" type="xs:string"/>
-  <xs:element name="labelFooter" type="xs:string"/>
-
-  <xs:element name="fieldLocVerbatim" type="xs:string"/>
-  <xs:element name="fieldCollectionDateEarliest" type="xs:string"/>
-  <xs:element name="fieldCollectionDateLatest" type="xs:string"/>
-  <xs:element name="fieldLocLatDecimal" type="xs:string"/>
-  <xs:element name="fieldLocLongDecimal" type="xs:string"/>
-  <xs:element name="fieldLocElevation" type="xs:string"/>
-
-  <!-- These will become contolled lists -->
-  <xs:element name="fieldLocGeodeticDatum" type="xs:string"/>
-  <xs:element name="fieldLocCoordinateSystem" type="xs:string"/>
-  <xs:element name="fieldLocCounty" type="xs:string"/>
-  <xs:element name="fieldLocState" type="xs:string"/>
-  <xs:element name="fieldLocCountry" type="xs:string"/>
-  <xs:element name="fieldLocHigherGeography" type="xs:string"/>
-
-  <xs:element name="taxonomicIdentGroupList" type="taxonomicIdentGroupList"/>
-  <xs:element name="typeSpecimenGroupList" type="typeSpecimenGroupList"/>
-  <xs:element name="fieldCollElevationGroupList" type="fieldCollElevationGroupList"/>
-  <xs:element name="fieldCollDepthGroupList" type="fieldCollDepthGroupList"/>
-  <xs:element name="associatedTaxaGroupList" type="associatedTaxaGroupList"/>
-
-	<xs:complexType name="taxonomicIdentGroupList">
-			<xs:sequence>
-					<xs:element name="taxonomicIdentGroup" type="taxonomicIdentGroup" minOccurs="0"
-							maxOccurs="unbounded"/>
-			</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="taxonomicIdentGroup">
-			<xs:sequence>
-					<xs:element name="taxon" type="xs:string"/>
-					<xs:element name="qualifier" type="xs:string"/>
-					<xs:element name="identBy" type="xs:string"/>
-					<xs:element name="identDate" type="xs:string"/>
-					<xs:element name="institution" type="xs:string"/>
-					<xs:element name="identKind" type="xs:string"/>
-					<xs:element name="reference" type="xs:string"/>
-					<xs:element name="refPage" type="xs:string"/>
-					<xs:element name="notes" type="xs:string"/>
-			 </xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="typeSpecimenGroupList">
-			<xs:sequence>
-					<xs:element name="typeSpecimenGroup" type="typeSpecimenGroup" minOccurs="0"
-							maxOccurs="unbounded"/>
-			</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="typeSpecimenGroup">
-			<xs:sequence>
-					<xs:element name="kindOfType" type="xs:string"/>
-					<xs:element name="reference" type="xs:string"/>
-					<xs:element name="refPage" type="xs:string"/>
-					<xs:element name="institution" type="xs:string"/>
-					<xs:element name="institutionType" type="xs:string"/>
-					<xs:element name="notes" type="xs:string"/>
-			 </xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="fieldCollElevationGroupList">
-			<xs:sequence>
-					<xs:element name="fieldCollElevationGroup" type="fieldCollElevationGroup" minOccurs="0"
-							maxOccurs="unbounded"/>
-			</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="fieldCollElevationGroup">
-			<xs:sequence>
-					<xs:element name="minElevation" type="xs:integer"/>
-					<xs:element name="maxElevation" type="xs:integer"/>
-					<xs:element name="units" type="xs:string"/>
-					<xs:element name="qualifier" type="xs:string"/>
-					<xs:element name="notes" type="xs:string"/>
-			 </xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="fieldCollDepthGroupList">
-			<xs:sequence>
-					<xs:element name="fieldCollDepthGroup" type="fieldCollDepthGroup" minOccurs="0"
-							maxOccurs="unbounded"/>
-			</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="fieldCollDepthGroup">
-			<xs:sequence>
-					<xs:element name="minDepth" type="xs:integer"/>
-					<xs:element name="maxDepth" type="xs:integer"/>
-					<xs:element name="units" type="xs:string"/>
-					<xs:element name="qualifier" type="xs:string"/>
-					<xs:element name="notes" type="xs:string"/>
-			 </xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="associatedTaxaGroupList">
-			<xs:sequence>
-					<xs:element name="associatedTaxaGroup" type="associatedTaxaGroup" minOccurs="0"
-							maxOccurs="unbounded"/>
-			</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="associatedTaxaGroup">
-			<xs:sequence>
-					<xs:element name="taxon" type="xs:string"/>
-					<xs:element name="commonName" type="xs:integer"/>
-					<xs:element name="interaction" type="xs:integer"/>
-			 </xs:sequence>
-	</xs:complexType>
-
-</xs:schema>
diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml
index 4c2f2e227..ef1a30ac6 100644
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -18,7 +18,9 @@
     </description>
 
     <modules>
-        <module>nuxeo-platform-cs-collectionobject</module>
+    	<module>nuxeo-platform-collectionobjects_common</module>
+		<module>nuxeo-platform-cs-collectionobject</module>
+        <module>nuxeo-platform-collectionobject-hearst</module>
     </modules>
 
 </project>
diff --git a/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java b/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java
index 2dc344b09..3a611d7dd 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java
@@ -336,6 +336,21 @@ public abstract class AbstractServiceContextImpl<IT, OT>
         // object.
         return (overrideDocumentType != null) ? overrideDocumentType : serviceBinding.getObject().getName();
     }
+    
+    @Override
+    public String getTenantQualifiedDoctype(String docType) {
+        // If they have not overridden the setting, use the type of the service
+        // object.
+        String result = docType + ServiceContext.TENANT_SUFFIX + this.getTenantId();
+        
+        return result;
+    }
+    
+    @Override
+    public String getTenantQualifiedDoctype() {
+        String docType = (overrideDocumentType != null) ? overrideDocumentType : serviceBinding.getObject().getName();
+    	return getTenantQualifiedDoctype(docType);
+    }
 
     /* (non-Javadoc)
      * @see org.collectionspace.services.common.context.ServiceContext#setDocumentType(java.lang.String)
diff --git a/services/common/src/main/java/org/collectionspace/services/common/context/ServiceContext.java b/services/common/src/main/java/org/collectionspace/services/common/context/ServiceContext.java
index cd0fb5b31..ccfdb588c 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/context/ServiceContext.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/context/ServiceContext.java
@@ -32,6 +32,7 @@ import javax.ws.rs.core.UriInfo;
 import org.collectionspace.services.common.ClientType;
 import org.collectionspace.services.common.document.DocumentHandler;
 import org.collectionspace.services.common.document.ValidatorHandler;
+import org.collectionspace.services.common.query.QueryContext;
 import org.collectionspace.services.common.security.SecurityContext;
 import org.collectionspace.services.common.security.UnauthorizedException;
 import org.collectionspace.services.common.service.ObjectPartType;
@@ -51,6 +52,8 @@ public interface ServiceContext<IT, OT> {
     public static final String PART_LABEL_SEPARATOR = "_";
     /** The Constant PART_COMMON_LABEL. */
     public static final String PART_COMMON_LABEL = "common";
+    /** Used to qualify document types **/
+	public static final String TENANT_SUFFIX = "Tenant";    
 
     /**
      * getSecurityContext is contains security info. for the service layer
@@ -92,6 +95,18 @@ public interface ServiceContext<IT, OT> {
      * @return service name
      */
     public String getDocumentType();
+    
+    /**
+     * Returns a tenant qualified document type.
+     * 
+     */
+    public String getTenantQualifiedDoctype();
+    
+    /**
+     * Returns a tenant qualified document type.
+     * 
+     */
+    public String getTenantQualifiedDoctype(String docType);
 
     /**
      * setDocumentType sets the name of the Document Type for this service
diff --git a/services/common/src/main/java/org/collectionspace/services/common/query/QueryContext.java b/services/common/src/main/java/org/collectionspace/services/common/query/QueryContext.java
index 1ba06a4f1..f23e1786b 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/query/QueryContext.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/query/QueryContext.java
@@ -31,9 +31,7 @@ public class QueryContext {
     String tenantId;
 
     static public final String getTenantQualifiedDoctype(QueryContext queryContext, String docType) {
-//    	return queryContext.getTenantId() + "_" + docType;
-    	return docType; //FIXME: Need to use the line above to get a qualified doctype name 
-
+    	return docType + ServiceContext.TENANT_SUFFIX + queryContext.getTenantId();
     }
     
     /**
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
index 20bcf75e2..3eadf6ed7 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
@@ -19,6 +19,7 @@ package org.collectionspace.services.nuxeo.client.java;
 
 import java.util.Hashtable;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -58,6 +59,8 @@ import org.nuxeo.ecm.core.api.IdRef;
 import org.nuxeo.ecm.core.api.PathRef;
 import org.nuxeo.ecm.core.api.repository.RepositoryInstance;
 import org.nuxeo.ecm.core.client.NuxeoClient;
+import org.nuxeo.ecm.core.schema.SchemaManager;
+import org.nuxeo.runtime.api.Framework;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -123,10 +126,12 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
             DocumentHandler handler) throws BadRequestException,
             DocumentException {
 
-        if (ctx.getDocumentType() == null) {
+    	String docType = NuxeoUtils.getTenantQualifiedDocType(ctx); //ctx.getDocumentType();
+        if (docType == null) {
             throw new IllegalArgumentException(
                     "RepositoryJavaClient.create: docType is missing");
         }
+    	
         if (handler == null) {
             throw new IllegalArgumentException(
                     "RepositoryJavaClient.create: handler is missing");
@@ -147,8 +152,7 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
             //give our own ID so PathRef could be constructed later on
             String id = IdUtils.generateId(UUID.randomUUID().toString());
             // create document model
-            DocumentModel doc = repoSession.createDocumentModel(wspacePath, id,
-                    ctx.getDocumentType());
+            DocumentModel doc = repoSession.createDocumentModel(wspacePath, id, docType);
             ((DocumentModelHandler) handler).setRepositorySession(repoSession);
             DocumentWrapper<DocumentModel> wrapDoc = new DocumentWrapperImpl<DocumentModel>(doc);
             handler.handle(Action.CREATE, wrapDoc);
@@ -248,7 +252,7 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
 
             DocumentModelList docList = null;
             // force limit to 1, and ignore totalSize
-            String query = NuxeoUtils.buildNXQLQuery(queryContext);
+            String query = NuxeoUtils.buildNXQLQuery(ctx, queryContext);
             docList = repoSession.query(query, null, 1, 0, false);
             if (docList.size() != 1) {
                 throw new DocumentNotFoundException("No document found matching filter params.");
@@ -343,7 +347,7 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
             repoSession = getRepositorySession();
             DocumentModelList docList = null;
             // force limit to 1, and ignore totalSize
-            String query = NuxeoUtils.buildNXQLQuery(queryContext);
+            String query = NuxeoUtils.buildNXQLQuery(ctx, queryContext);
             docList = repoSession.query(query,
                     null, //Filter
                     1, //limit
@@ -610,7 +614,7 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
             handler.prepare(Action.GET_ALL);
             repoSession = getRepositorySession();
             DocumentModelList docList = null;
-            String query = NuxeoUtils.buildNXQLQuery(queryContext);
+            String query = NuxeoUtils.buildNXQLQuery(ctx, queryContext);
 
             if (logger.isDebugEnabled()) {
                 logger.debug("Executing NXQL query: " + query.toString());
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
index 03bc26d63..0a0215075 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
@@ -25,6 +25,7 @@ import java.io.File;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -34,6 +35,7 @@ import org.collectionspace.services.client.IQueryManager;
 import org.collectionspace.services.client.PoxPayloadIn;
 import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.common.context.ServiceContext;
+import org.collectionspace.services.common.document.BadRequestException;
 import org.collectionspace.services.common.document.DocumentException;
 import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.common.document.DocumentWrapperImpl;
@@ -62,9 +64,11 @@ import org.nuxeo.ecm.core.io.impl.DocumentPipeImpl;
 import org.nuxeo.ecm.core.io.impl.plugins.SingleDocumentReader;
 import org.nuxeo.ecm.core.io.impl.plugins.XMLDocumentWriter;
 
+import org.nuxeo.ecm.core.schema.SchemaManager;
 import org.nuxeo.ecm.core.search.api.client.querymodel.descriptor.QueryModelDescriptor;
 import org.nuxeo.ecm.core.storage.sql.jdbc.ResultSetQueryResult;
 import org.nuxeo.ecm.core.query.sql.NXQL;
+import org.nuxeo.runtime.api.Framework;
 
 
 import org.slf4j.Logger;
@@ -349,9 +353,9 @@ public class NuxeoUtils {
      * @return an NXQL query
      * @throws Exception if supplied values in the query are invalid.
      */
-    static public final String buildNXQLQuery(QueryContext queryContext) throws Exception {
+    static public final String buildNXQLQuery(ServiceContext ctx, QueryContext queryContext) throws Exception {
         StringBuilder query = new StringBuilder("SELECT * FROM ");
-        query.append(queryContext.getTenantQualifiedDoctype()); // Nuxeo doctype must be tenant qualified.
+        query.append(NuxeoUtils.getTenantQualifiedDocType(queryContext)); // Nuxeo doctype must be tenant qualified.
         appendNXQLWhere(query, queryContext);
         appendNXQLOrderBy(query, queryContext);
         return query.toString();
@@ -364,7 +368,7 @@ public class NuxeoUtils {
      * @param queryContext the query context
      * @return an NXQL query
      */
-    static public final String buildNXQLQuery(List<String> docTypes, QueryContext queryContext) {
+    static public final String buildNXQLQuery(List<String> docTypes, QueryContext queryContext) throws Exception {
         StringBuilder query = new StringBuilder("SELECT * FROM "); 
         boolean fFirst = true;
         for (String docType : docTypes) {
@@ -373,7 +377,7 @@ public class NuxeoUtils {
             } else {
                 query.append(",");
             }
-            String tqDocType = QueryContext.getTenantQualifiedDoctype(queryContext, docType);
+            String tqDocType = getTenantQualifiedDocType(queryContext, docType);
             query.append(tqDocType); // Nuxeo doctype must be tenant qualified.
         }
         appendNXQLWhere(query, queryContext);
@@ -396,7 +400,7 @@ public class NuxeoUtils {
         //
         // Since we're doing a query, we get back a list so we need to make sure there is only
         // a single result since CSID values are supposed to be unique.
-        String query = buildNXQLQuery(queryContext);
+        String query = buildNXQLQuery(ctx, queryContext);
         docModelList = repoSession.query(query);
         long resultSize = docModelList.totalSize();
         if (resultSize == 1) {
@@ -511,4 +515,60 @@ public class NuxeoUtils {
 			
 		return result;
     }
+    
+    public static String getTenantQualifiedDocType(ServiceContext ctx, String docType) throws Exception {
+    	String result = docType;
+    	
+		String tenantQualifiedDocType = ctx.getTenantQualifiedDoctype(docType);
+		if (docTypeExists(tenantQualifiedDocType) == true) {
+			result = tenantQualifiedDocType;
+		}
+		
+    	return result;
+    }
+
+    public static String getTenantQualifiedDocType(ServiceContext ctx) {
+    	String result = null;
+    	try {
+    		String docType = ctx.getDocumentType();
+    		result = getTenantQualifiedDocType(ctx, docType);
+    	} catch (Exception e) {
+    		logger.error("Could not get tentant qualified doctype.", e);
+    	}
+    	return result;
+    }
+    
+    public static String getTenantQualifiedDocType(QueryContext queryCtx, String docType) throws Exception {
+    	String result = docType;
+    	
+    	String tenantQualifiedDocType = queryCtx.getTenantQualifiedDoctype();
+		if (docTypeExists(tenantQualifiedDocType) == true) {
+			result = tenantQualifiedDocType;
+		}
+		
+    	return result;
+    }
+    
+    public static String getTenantQualifiedDocType(QueryContext queryCtx) throws Exception {		
+    	return getTenantQualifiedDocType(queryCtx, queryCtx.getDocType());
+    }
+    
+    static private boolean docTypeExists(String docType) throws Exception {
+    	boolean result = false;
+    	
+        SchemaManager schemaManager = null;
+    	try {
+			schemaManager = Framework.getService(org.nuxeo.ecm.core.schema.SchemaManager.class);
+		} catch (Exception e1) {
+			// TODO Auto-generated catch block
+			logger.error("Could not get Nuxeo SchemaManager instance.", e1);
+			throw e1;
+		}
+		Set<String> docTypes = schemaManager.getDocumentTypeNamesExtending(docType);
+		if (docTypes != null && docTypes.contains(docType)) {
+			result = true;
+		}
+		
+    	return result;
+    }
 }
-- 
2.47.3