From 49bffdcd62f39cd2c54b95370a73a236bf2e524e Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Sat, 15 May 2010 00:24:06 +0000
Subject: [PATCH] CSPACE-1832: All CSpace specific Nuxeo document types now
 contain new "core" document type with tenant_id.

---
 3rdparty/nuxeo/build.xml                      |   2 +
 .../nuxeo-platform-collectionspace/build.xml  | 114 +++++++++++++++---
 .../nuxeo-platform-collectionspace/pom.xml    |   7 +-
 .../src/main/resources/META-INF/MANIFEST.MF   |   8 +-
 .../resources/OSGI-INF/core-types-contrib.xml |   8 +-
 .../resources/OSGI-INF/ecm-types-contrib.xml  |  13 +-
 .../resources/OSGI-INF/layouts-contrib.xml    | 110 +----------------
 .../resources/schemas/collectionobject.xsd    |  26 ----
 .../schemas/collectionspace_core.xsd          |  18 +++
 3rdparty/nuxeo/pom.xml                        |  47 --------
 3rdparty/pom.xml                              |   2 +
 .../test/PerformanceTest.java                 |  23 ++--
 .../resources/OSGI-INF/core-types-contrib.xml |   1 +
 .../resources/OSGI-INF/ecm-types-contrib.xml  |   1 +
 .../pom.xml                                   |   5 +-
 .../src/main/resources/META-INF/MANIFEST.MF   |   3 +-
 .../resources/OSGI-INF/core-types-contrib.xml |   1 +
 .../resources/OSGI-INF/ecm-types-contrib.xml  |   2 +-
 .../resources/OSGI-INF/core-types-contrib.xml |   1 +
 .../resources/OSGI-INF/ecm-types-contrib.xml  |   1 +
 .../src/main/resources/META-INF/MANIFEST.MF   |   3 +-
 .../resources/OSGI-INF/core-types-contrib.xml |   1 +
 .../resources/OSGI-INF/ecm-types-contrib.xml  |   4 +-
 .../resources/OSGI-INF/core-types-contrib.xml |   1 +
 .../resources/OSGI-INF/ecm-types-contrib.xml  |   1 +
 .../resources/OSGI-INF/core-types-contrib.xml |   1 +
 .../resources/OSGI-INF/ecm-types-contrib.xml  |   1 +
 .../resources/OSGI-INF/core-types-contrib.xml |   2 +
 .../resources/OSGI-INF/ecm-types-contrib.xml  |   1 +
 .../resources/OSGI-INF/core-types-contrib.xml |   5 +
 .../resources/OSGI-INF/ecm-types-contrib.xml  |   2 +
 .../resources/OSGI-INF/core-types-contrib.xml |   5 +
 .../resources/OSGI-INF/ecm-types-contrib.xml  |   2 +
 services/person/sample/sample/pom.xml         |   6 +-
 .../resources/OSGI-INF/core-types-contrib.xml |   3 +
 .../resources/OSGI-INF/ecm-types-contrib.xml  |   1 +
 .../resources/OSGI-INF/core-types-contrib.xml |   5 +
 .../resources/OSGI-INF/ecm-types-contrib.xml  |   2 +
 38 files changed, 212 insertions(+), 227 deletions(-)
 delete mode 100644 3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionobject.xsd
 create mode 100644 3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionspace_core.xsd

diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml
index 7bf63d8bc..625438c27 100644
--- a/3rdparty/nuxeo/build.xml
+++ b/3rdparty/nuxeo/build.xml
@@ -123,11 +123,13 @@
                 <include name="*.jar"/>
             </fileset>
         </copy>
+        <ant antfile="nuxeo-platform-collectionspace/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
     description="undeploy nuxeo client libs from ${jboss.server.cspace}">
         <delete dir="${jboss.server.cspace}/nuxeo-client"/>
+        <ant antfile="nuxeo-platform-collectionspace/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
     <target name="dist"
diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml
index e26e09c58..c02b71cad 100644
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml
@@ -1,16 +1,102 @@
-<?xml version="1.0"?>
-<project name="nuxeo cs" default="all" basedir=".">
-
-    <!-- enviornment should be declared before reading build.properties -->
-    <property environment="env" />
-  <property file="build.properties" />
-  <property name="cs.nuxeo.jar" value="nuxeo-platform-collectionspace-5.2-SNAPSHOT.jar"/>
-
-  <target name="all" description="all">
-    <delete file="${jboss.nuxeo.ear.dir}/system/${cs.nuxeo.jar}"/>
-    <copy todir="${jboss.nuxeo.ear.dir}/system">
-      <fileset file="${basedir}/target/${cs.nuxeo.jar}" />
-    </copy>
+<project name="nuxeo-platform-cs-collectionspace_core" default="package" basedir=".">
+  <description>
+    CollectionSpace Core 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.collectionspace_core.jar"
+    value="org.collectionspace.services.3rdparty.nuxeo.collectionspace_core-${cspace.release}.jar"/>
+  <property name="nuxeo.collectionspace_core.jars.all"
+    value="nuxeo-platform-collectionspace_core-*.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="deploy" depends="install"
+    description="deploy dimension doctype in ${jboss.server.nuxeo}">
+    <copy file="${basedir}/target/${nuxeo.collectionspace_core.jar}"
+      todir="${jboss.deploy.nuxeo.plugins}"/>
+  </target>
+  
+  <target name="undeploy"
+    description="undeploy dimension doctype from ${jboss.server.nuxeo}">
+    <delete>
+      <fileset dir="${jboss.deploy.nuxeo.plugins}">
+        <include name="${nuxeo.collectionspace_core.jars.all}"/>
+      </fileset>
+      <!-- Legacy deployment location through release 0.6 -->
+      <fileset dir="${jboss.deploy.nuxeo.system}">
+        <include name="${nuxeo.collectionspace_core.jars.all}"/>
+      </fileset>
+    </delete>
+  </target>
+  
 </project>
diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
index e1bab3098..acf219cca 100644
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
@@ -10,9 +10,8 @@
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.collectionspace.services</groupId>
-  <artifactId>nuxeo-platform-collectionspace</artifactId>
-  <packaging>pom</packaging>
-  <name>Nuxeo CS extensions</name>
+  <artifactId>org.collectionspace.services.3rdparty.nuxeo.collectionspace_core</artifactId>
+  <name>Nuxeo CollectionSpace core extension</name>
   <description> Nuxeo Enterprise Platform: CS extensions </description>
 
   <build>
@@ -23,7 +22,7 @@
         <version>2.2</version>
         <configuration>
           <archive>
-            <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
+            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
             <manifestEntries>
               <Bundle-Version>${eclipseVersion}</Bundle-Version>
               <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF
index 91c534186..716581666 100644
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0 
 Bundle-ManifestVersion: 1 
-Bundle-Name: NuxeoCS
-Bundle-SymbolicName: org.collectionspace.collectionobject;singleton:=true 
+Bundle-Name: org.collectionspace.collectionspace_core
+Bundle-SymbolicName: org.collectionspace.collectionspace_core;singleton:=true 
 Bundle-Version: 1.0.0
 Bundle-Localization: plugin
-Bundle-Vendor: Nuxeo 
+Bundle-Vendor: Nuxeo
 Require-Bundle: org.nuxeo.runtime, 
  org.nuxeo.ecm.core.api, 
  org.nuxeo.ecm.core,
@@ -15,7 +15,7 @@ Require-Bundle: org.nuxeo.runtime,
  org.nuxeo.ecm.platform.forms.layout.client,
  org.nuxeo.ecm.platform.publishing.api,
  org.nuxeo.ecm.platform.ws 
-Provide-Package: org.collectionspace.collectionobject
+Provide-Package: org.collectionspace.collectionspace_core
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,
  OSGI-INF/ecm-types-contrib.xml,
  OSGI-INF/layouts-contrib.xml
diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/core-types-contrib.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/core-types-contrib.xml
index 72aa5ef19..c19ad0ad2 100644
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
-<component name="org.collectionspace.collectionobject.coreTypes">
+<component name="org.collectionspace.collectionspace_core.coreTypes">
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="collectionobject" prefix="collectionobject" src="schemas/collectionobject.xsd"/>
+    <schema name="collectionspace_core" prefix="collectionspace_core" src="schemas/collectionspace_core.xsd"/>
   </extension>
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="CollectionObject" extends="Document">
+    <doctype name="CollectionSpace_Core" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
-      <schema name="collectionobject"/>
+      <schema name="collectionspace_core"/>
     </doctype>
   </extension>
 </component>
diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index 541251f1e..687a5a239 100644
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -1,28 +1,27 @@
 <?xml version="1.0"?>
-<component name="org.collectionspace.collectionobject.ecm.types">
+<component name="org.collectionspace.collectionspace_core.ecm.types">
   <extension target="org.nuxeo.ecm.platform.types.TypeService" point="types">
-    <type id="CollectionObject" coretype="CollectionObject">
-      <label>org.collectionspace.collectionobject</label>
+    <type id="CollectionSpace_Core" coretype="CollectionSpace_Core">
+      <label>org.collectionspace.collectionspace_core</label>
       <!--icon>/icons/file.gif</icon-->
       <default-view>view_documents</default-view>
 
       <layouts mode="any">
         <layout>heading</layout>
-        <layout>collectionobject</layout>
+        <layout>collectionspace_core</layout>
       </layouts>        
     </type>
 
     <type id="Folder" coretype="Folder">
       <subtypes>
-        <type>CollectionObject</type>
+        <type>CollectionSpace_Core</type>
       </subtypes>
     </type>
     
     <type id="Workspace" coretype="Workspace">
       <subtypes>
-        <type>CollectionObject</type>
+        <type>CollectionSpace_Core</type>
       </subtypes>
     </type>
-
   </extension>
 </component>
diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/layouts-contrib.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/layouts-contrib.xml
index ee35a77d4..279de1553 100644
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -1,123 +1,25 @@
 <?xml version="1.0"?>
 
-<component name="org.collectionspace.collectionobject.layouts.webapp">
+<component name="org.collectionspace.collectionspace_core.layouts.webapp">
 
   <extension target="org.nuxeo.ecm.platform.forms.layout.WebLayoutManager"
     point="layouts">
 
-    <layout name="collectionobject">
+    <layout name="collectionspace_core">
       <templates>
         <template mode="any">/layouts/layout_default_template.xhtml</template>
       </templates>
       <rows>
-        <row><widget>objectNumber</widget></row>
-        <row><widget>otherNumber</widget></row>
-        <row><widget>briefDescription</widget></row>
-        <row><widget>comments</widget></row>
-        <row><widget>distFeatures</widget></row>
-        <row><widget>objectName</widget></row>
-        <row><widget>responsibleDept</widget></row>
-        <row><widget>title</widget></row>
+        <row><widget>tenantId</widget></row>
       </rows>
 
-      <widget name="objectNumber" type="text">
+      <widget name="tenantId" type="text">
         <labels>
-          <label mode="any">objectNumber</label>
+          <label mode="any">tenantId</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="collectionobject">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="collectionobject">otherNumber</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="collectionobject">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="collectionobject">comments</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-
-      <widget name="distFeatures" type="text">
-        <labels>
-          <label mode="any">distFeatures</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobject">distFeatures</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="collectionobject">objectName</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-
-      <widget name="responsibleDept" type="text">
-        <labels>
-          <label mode="any">responsibleDept</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobject">responsibleDept</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="collectionobject">title</field>
+          <field schema="collectionspace_core">tenantId</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionobject.xsd b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionobject.xsd
deleted file mode 100644
index 651013caf..000000000
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionobject.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-    Older (?) CollectionObject Schema for Nuxeo EP
-
-    $LastChangedRevision$
-    $LastChangedDate$
--->
-
-<xs:schema 
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:ns="http://collectionspace.org/collectionobject/"
-    xmlns="http://collectionspace.org/collectionobject/"
-    targetNamespace="http://collectionspace.org/collectionobject/"
-    version="0.1">
-
-    <xs:element name="objectNumber" type="xs:string"/>
-    <xs:element name="otherNumber" type="xs:string"/>
-    <xs:element name="briefDescription" type="xs:string"/>
-    <xs:element name="comments" type="xs:string"/>
-    <xs:element name="distinguishingFeatures" type="xs:string"/>
-    <xs:element name="objectName" type="xs:string"/>
-    <xs:element name="responsibleDepartment" type="xs:string"/>
-    <xs:element name="title" type="xs:string"/>
-    
-</xs:schema>
diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionspace_core.xsd b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionspace_core.xsd
new file mode 100644
index 000000000..c7f45ea67
--- /dev/null
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionspace_core.xsd
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    Older (?) CollectionObject Core Schema for Nuxeo EP
+
+    $LastChangedRevision$
+    $LastChangedDate$
+-->
+
+<xs:schema 
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:ns="http://collectionspace.org/collectionspace_core/"
+    xmlns="http://collectionspace.org/collectionspace_core/"
+    targetNamespace="http://collectionspace.org/collectionspace_core/"
+    version="0.1">
+
+    <xs:element name="tenantId" type="xs:string"/>    
+</xs:schema>
diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml
index 09b6d94b0..2b62c2d31 100644
--- a/3rdparty/nuxeo/pom.xml
+++ b/3rdparty/nuxeo/pom.xml
@@ -30,53 +30,6 @@
             <version>2.2.2.SP8</version>
             <scope>provided</scope>
         </dependency>
-        <!-- Nuxeo -->
-        <!-- Nuxeo Dependencies with versions
-        <dependency>
-            <groupId>org.nuxeo.common</groupId>
-            <artifactId>nuxeo-common</artifactId>
-            <version>1.5.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.runtime</groupId>
-            <artifactId>nuxeo-runtime</artifactId>
-            <version>1.5.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.runtime</groupId>
-            <artifactId>nuxeo-runtime-osgi</artifactId>
-            <version>1.5.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-api</artifactId>
-            <version>1.5.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-client</artifactId>
-            <version>1.5.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-query</artifactId>
-            <version>1.5.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-schema</artifactId>
-            <version>1.5.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-io</artifactId>
-            <version>1.5.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-facade</artifactId>
-            <version>1.5.1-SNAPSHOT</version>
-        </dependency> -->
     </dependencies>
 
 </project>
diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml
index 50224fe0d..f8c12e689 100644
--- a/3rdparty/pom.xml
+++ b/3rdparty/pom.xml
@@ -22,6 +22,7 @@
     </dependencyManagement>
 
     <build>
+<!--
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -34,6 +35,7 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+-->        
     </build>
 
 </project>
diff --git a/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/PerformanceTest.java b/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/PerformanceTest.java
index 0706ccc6d..c9d682109 100644
--- a/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/PerformanceTest.java
+++ b/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/PerformanceTest.java
@@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory;
 import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
 import org.jboss.resteasy.plugins.providers.multipart.OutputPart;
+import org.jboss.resteasy.util.HttpResponseCodes;
 
 import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.client.CollectionObjectClient;
@@ -65,19 +66,19 @@ public class PerformanceTest extends CollectionSpacePerformanceTest {
 	// Get clients for the CollectionSpace services
 	//
 	/** The MA x_ records. */
-	private static int MAX_RECORDS = 1000;
+	private static int MAX_RECORDS = 1;
 
 	/**
 	 * Performance test.
 	 */
 	@Test
 	public void performanceTest() {
-		roundTripOverhead(10);
-		deleteCollectionObjects();
+//		roundTripOverhead(MAX_RECORDS);
+//		deleteCollectionObjects();
 		String[] coList = this.createCollectionObjects(MAX_RECORDS);
-		this.searchCollectionObjects(MAX_RECORDS);
-		this.deleteCollectionObjects(coList);
-		roundTripOverhead(10);
+//		this.searchCollectionObjects(MAX_RECORDS);
+//		this.deleteCollectionObjects(coList);
+//		roundTripOverhead(10);
 	}
 	
 	/**
@@ -91,9 +92,15 @@ public class PerformanceTest extends CollectionSpacePerformanceTest {
 		CollectionObjectClient collectionObjectClient = new CollectionObjectClient();
 		
 		long totalTime = 0;
+		ClientResponse<Response> response;
 		for (int i = 0; i < numOfCalls; i++) {
-			Date startTime = new Date();
-			collectionObjectClient.roundtrip().releaseConnection();
+			Date startTime = new Date();			
+			response = collectionObjectClient.roundtrip();
+			try {
+				Assert.assertEquals(response.getStatus(), HttpResponseCodes.SC_OK);
+			} finally {
+				response.releaseConnection();
+			}
 			Date stopTime = new Date();
 			totalTime = totalTime + (stopTime.getTime() - startTime.getTime());
 			System.out.println("Overhead roundtrip time is: " + (stopTime.getTime() - startTime.getTime()));
diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/core-types-contrib.xml
index e2b0c7c73..f2673da13 100644
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -7,6 +7,7 @@
     <doctype name="Acquisition" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="acquisitions_common"/>
     </doctype>
   </extension>
diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index 77fb0fa70..3e01a2208 100644
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>acquisition</layout>
       </layouts>        
     </type>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
index dc146afc8..d668330b0 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
@@ -15,13 +15,16 @@
     <description>
         CollectionObject Nuxeo document type
     </description>
-    
+
     <build>
         <plugins>
             <plugin>
                 <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 91c534186..9103c7a00 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
@@ -14,7 +14,8 @@ Require-Bundle: org.nuxeo.runtime,
  org.nuxeo.ecm.platform.ui,
  org.nuxeo.ecm.platform.forms.layout.client,
  org.nuxeo.ecm.platform.publishing.api,
- org.nuxeo.ecm.platform.ws 
+ org.nuxeo.ecm.platform.ws,
+ org.collectionspace.collectionspace_core
 Provide-Package: org.collectionspace.collectionobject
 Nuxeo-Component: OSGI-INF/core-types-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 9b58b6ea7..0c7d8a64b 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
@@ -8,6 +8,7 @@
         <doctype name="CollectionObject" extends="Document">
             <schema name="common"/>
             <schema name="dublincore"/>
+            <schema name="collectionspace_core"/>
             <schema name="collectionobjects_common"/>
             <schema name="collectionobjects_naturalhistory"/>
         </doctype>
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 541251f1e..1627222b9 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
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>collectionobject</layout>
       </layouts>        
     </type>
@@ -23,6 +24,5 @@
         <type>CollectionObject</type>
       </subtypes>
     </type>
-
   </extension>
 </component>
diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/core-types-contrib.xml
index 7a4993769..d9abcdb9c 100644
--- a/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -7,6 +7,7 @@
     <doctype name="Contact" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="contacts_common"/>
     </doctype>
   </extension>
diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index e7aed9620..f7388999a 100644
--- a/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>contact</layout>
       </layouts>        
     </type>
diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/META-INF/MANIFEST.MF b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/META-INF/MANIFEST.MF
index 1d4f1d6ae..78c47df0c 100644
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/META-INF/MANIFEST.MF
@@ -14,7 +14,8 @@ Require-Bundle: org.nuxeo.runtime,
  org.nuxeo.ecm.platform.ui,
  org.nuxeo.ecm.platform.forms.layout.client,
  org.nuxeo.ecm.platform.publishing.api,
- org.nuxeo.ecm.platform.ws 
+ org.nuxeo.ecm.platform.ws,
+ org.collectionspace.collectionspace_core
 Provide-Package: org.collectionspace.dimension
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,
  OSGI-INF/ecm-types-contrib.xml,
diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/core-types-contrib.xml
index 5459babc3..dfc4193cb 100644
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -7,6 +7,7 @@
     <doctype name="Dimension" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="dimensions_common"/>
     </doctype>
   </extension>
diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index 2e4e78555..ed2516fdd 100644
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -8,8 +8,9 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>dimension</layout>
-      </layouts>        
+      </layouts>
     </type>
 
     <type id="Folder" coretype="Folder">
@@ -23,6 +24,5 @@
         <type>Dimension</type>
       </subtypes>
     </type>
-
   </extension>
 </component>
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/core-types-contrib.xml
index 98b355bb6..5ffa7dd83 100644
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -7,6 +7,7 @@
     <doctype name="Intake" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="intakes_common"/>
     </doctype>
   </extension>
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index 39d792cc3..e925cfb47 100644
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>        
         <layout>intake</layout>
       </layouts>        
     </type>
diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/core-types-contrib.xml
index 97f9fad17..eac1f6ad9 100644
--- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -7,6 +7,7 @@
     <doctype name="Loanin" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="loansin_common"/>
     </doctype>
   </extension>
diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index b4ba61971..4aa04a650 100644
--- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>loanin</layout>
       </layouts>        
     </type>
diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/OSGI-INF/core-types-contrib.xml
index 4d4171b0b..a1b016595 100644
--- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -3,10 +3,12 @@
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
     <schema name="loansout_common" prefix="loansout_common" src="schemas/loansout_common.xsd"/>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Loanout" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="loansout_common"/>
     </doctype>
   </extension>
diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index 3abdb6d6b..497add9f7 100644
--- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>loanout</layout>
       </layouts>        
     </type>
diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/core-types-contrib.xml
index 43059a21f..37981944a 100644
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -3,20 +3,25 @@
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
     <schema name="orgauthorities_common" prefix="orgauthorities_common" src="schemas/orgauthorities_common.xsd"/>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
     <schema name="organizations_common" prefix="organizations_common" src="schemas/organizations_common.xsd"/>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Orgauthority" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="orgauthorities_common"/>
     </doctype>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Organization" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="organizations_common"/>
     </doctype>
   </extension>
diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index e96ec8d3b..079d11c26 100644
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>csorgauthority</layout>
       </layouts>        
     </type>
@@ -33,6 +34,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>organization</layout>
       </layouts>        
     </type>
diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/core-types-contrib.xml
index e8eb9f719..bb073e447 100644
--- a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -3,20 +3,25 @@
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
     <schema name="personauthorities_common" prefix="personauthorities_common" src="schemas/personauthorities_common.xsd"/>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
     <schema name="persons_common" prefix="persons_common" src="schemas/persons_common.xsd"/>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Personauthority" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="personauthorities_common"/>
     </doctype>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Person" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="persons_common"/>
     </doctype>
   </extension>
diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index 837f0887e..39e7897f5 100644
--- a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>cspersonauthority</layout>
       </layouts>        
     </type>
@@ -33,6 +34,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>person</layout>
       </layouts>        
     </type>
diff --git a/services/person/sample/sample/pom.xml b/services/person/sample/sample/pom.xml
index e444091c5..1b4706400 100644
--- a/services/person/sample/sample/pom.xml
+++ b/services/person/sample/sample/pom.xml
@@ -11,17 +11,17 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.person.jaxb</artifactId>
-            <version>1.0</version>
+            <version>0.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>0.5-SNAPSHOT</version>
+            <version>0.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.person.client</artifactId>
-            <version>0.5-SNAPSHOT</version>
+            <version>0.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/core-types-contrib.xml
index b01746649..59033e59c 100644
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -14,14 +14,17 @@
     Description:
         Nuxeo document core type for CollectionSpace Relation
 -->
+
 <component name="org.collectionspace.relation.coreTypes">
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
     <schema name="relations_common" prefix="relations_common" src="schemas/relations_common.xsd"/>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Relation" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="relations_common"/>
     </doctype>
   </extension>
diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index 73a5d8016..16af49203 100644
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -23,6 +23,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>relation</layout>
       </layouts>
     </type>
diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/core-types-contrib.xml
index 16e331cc8..bc3e90caa 100644
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -3,20 +3,25 @@
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
     <schema name="vocabularies_common" prefix="vocabularies_common" src="schemas/vocabularies_common.xsd"/>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
     <schema name="vocabularyitems_common" prefix="vocabularyitems_common" src="schemas/vocabularyitems_common.xsd"/>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Vocabulary" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="vocabularies_common"/>
     </doctype>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Vocabularyitem" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="vocabularyitems_common"/>
     </doctype>
   </extension>
diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index 754987a80..5b10b8df4 100644
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>csvocabulary</layout>
       </layouts>        
     </type>
@@ -33,6 +34,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>vocabularyitem</layout>
       </layouts>        
     </type>
-- 
2.47.3