From 366db5791e45e700cfd6bf04d65188bc303f853c Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 11 May 2012 17:07:20 -0700
Subject: [PATCH] CSPACE-5169: Updated services doctype configuration for the
 six current Authority services with current path to termDisplayName field, to
 enable Nuxeo prefetch of data for that field.

---
 .../resources/OSGI-INF/core-types-contrib.xml | 49 +++++++++--------
 .../resources/OSGI-INF/core-types-contrib.xml | 49 +++++++++--------
 .../resources/OSGI-INF/core-types-contrib.xml | 54 +++++++++----------
 .../resources/OSGI-INF/core-types-contrib.xml | 50 +++++++++--------
 .../resources/OSGI-INF/core-types-contrib.xml | 30 ++++++-----
 .../resources/OSGI-INF/core-types-contrib.xml | 49 +++++++++--------
 .../resources/OSGI-INF/core-types-contrib.xml | 49 +++++++++--------
 7 files changed, 179 insertions(+), 151 deletions(-)

diff --git a/services/concept/3rdparty/nuxeo-platform-cs-concept/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/concept/3rdparty/nuxeo-platform-cs-concept/src/main/resources/OSGI-INF/core-types-contrib.xml
index 687ff79b3..c4381793a 100644
--- a/services/concept/3rdparty/nuxeo-platform-cs-concept/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/concept/3rdparty/nuxeo-platform-cs-concept/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -1,25 +1,30 @@
 <?xml version="1.0"?>
 <component name="org.collectionspace.concept.coreTypes">
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="conceptauthorities_common" prefix="conceptauthorities_common" src="schemas/conceptauthorities_common.xsd"/>
-  </extension>
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="concepts_common" prefix="concepts_common" src="schemas/concepts_common.xsd"/>
-  </extension>
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="Conceptauthority" extends="Document">
-      <schema name="common"/>
-      <schema name="collectionspace_core"/>
-      <schema name="dublincore"/>
-      <schema name="conceptauthorities_common"/>
-    </doctype>
-  </extension>
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="Conceptitem" extends="Document">
-      <schema name="common"/>
-      <schema name="collectionspace_core"/>
-      <schema name="dublincore"/>
-      <schema name="concepts_common"/>
-    </doctype>
-  </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
+        <schema name="conceptauthorities_common" prefix="conceptauthorities_common" src="schemas/conceptauthorities_common.xsd"/>
+    </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
+        <schema name="concepts_common" prefix="concepts_common" src="schemas/concepts_common.xsd"/>
+    </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
+        <doctype name="Conceptauthority" extends="Document">
+            <schema name="common"/>
+            <schema name="collectionspace_core"/>
+            <schema name="dublincore"/>
+            <schema name="conceptauthorities_common"/>
+        </doctype>
+    </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
+        <doctype name="Conceptitem" extends="Document">
+            <schema name="common"/>
+            <schema name="collectionspace_core"/>
+            <schema name="dublincore"/>
+            <schema name="concepts_common"/>
+            <prefetch>
+                concepts_common:conceptTermGroupList/0/termDisplayName
+                concepts_common:refName
+                concepts_common:shortIdentifier
+            </prefetch>    
+        </doctype>
+    </extension>
 </component>
diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/OSGI-INF/core-types-contrib.xml
index beef5a5c9..0ce87c9c6 100644
--- a/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -1,25 +1,30 @@
 <?xml version="1.0"?>
 <component name="org.collectionspace.location.coreTypes">
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="locationauthorities_common" prefix="locationauthorities_common" src="schemas/locationauthorities_common.xsd"/>
-  </extension>
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="locations_common" prefix="locations_common" src="schemas/locations_common.xsd"/>
-  </extension>
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="Locationauthority" extends="Document">
-      <schema name="common"/>
-      <schema name="collectionspace_core"/>
-      <schema name="dublincore"/>
-      <schema name="locationauthorities_common"/>
-    </doctype>
-  </extension>
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="Locationitem" extends="Document">
-      <schema name="common"/>
-      <schema name="collectionspace_core"/>
-      <schema name="dublincore"/>
-      <schema name="locations_common"/>
-    </doctype>
-  </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
+        <schema name="locationauthorities_common" prefix="locationauthorities_common" src="schemas/locationauthorities_common.xsd"/>
+    </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
+        <schema name="locations_common" prefix="locations_common" src="schemas/locations_common.xsd"/>
+    </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
+        <doctype name="Locationauthority" extends="Document">
+            <schema name="common"/>
+            <schema name="collectionspace_core"/>
+            <schema name="dublincore"/>
+            <schema name="locationauthorities_common"/>
+        </doctype>
+    </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
+        <doctype name="Locationitem" extends="Document">
+            <schema name="common"/>
+            <schema name="collectionspace_core"/>
+            <schema name="dublincore"/>
+            <schema name="locations_common"/>
+            <prefetch>
+                locations_common:locTermGroupList/0/termDisplayName
+                locations_common:refName
+                locations_common:shortIdentifier
+            </prefetch>
+        </doctype>
+    </extension>
 </component>
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 8ae285039..150f97d72 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
@@ -1,33 +1,33 @@
 <?xml version="1.0"?>
 <component name="org.collectionspace.organization.coreTypes">
-  <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="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="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="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"/>
-      <prefetch>
-      	organizations_common:displayName
-      	organizations_common:refName
-      	organizations_common:shortIdentifier
-      </prefetch>      
-    </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"/>
+            <prefetch>
+                organizations_common:orgTermGroupList/0/termDisplayName
+                organizations_common:refName
+                organizations_common:shortIdentifier
+            </prefetch>      
+        </doctype>
+    </extension>
 </component>
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 215837424..e4773279f 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
@@ -1,30 +1,34 @@
 <?xml version="1.0"?>
 <component name="org.collectionspace.person.coreTypes">
-  <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="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="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="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"/>
-      <prefetch>persons_common:displayName persons_common:refName persons_common:shortIdentifier</prefetch>
-    </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"/>
+            <prefetch>
+                persons_common:personTermGroupList/0/termDisplayName
+                persons_common:refName
+                persons_common:shortIdentifier
+            </prefetch>
+        </doctype>
+    </extension>
     
 </component>
diff --git a/services/person/3rdparty/nuxeo-platform-person-lifesci/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/person/3rdparty/nuxeo-platform-person-lifesci/src/main/resources/OSGI-INF/core-types-contrib.xml
index 2ffba8c1b..b7d0a0c0c 100644
--- a/services/person/3rdparty/nuxeo-platform-person-lifesci/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/person/3rdparty/nuxeo-platform-person-lifesci/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0"?>
 <component name="org.collectionspace.person.lifesci.coreTypes">
   
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="persons_naturalhistory" prefix="persons_naturalhistory" src="schemas/persons_naturalhistory.xsd"/>
-  </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
+        <schema name="persons_naturalhistory" prefix="persons_naturalhistory" src="schemas/persons_naturalhistory.xsd"/>
+    </extension>
   
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="PersonTenant2" extends="Person">
-      <schema name="common"/>
-      <schema name="dublincore"/>
-      <schema name="collectionspace_core"/>
-      <schema name="persons_common"/>
-      <schema name="persons_naturalhistory"/>
-      <prefetch>persons_common:displayName persons_common:refName persons_common:shortIdentifier</prefetch>
-    </doctype>
-  </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
+        <doctype name="PersonTenant2" extends="Person">
+            <schema name="common"/>
+            <schema name="dublincore"/>
+            <schema name="collectionspace_core"/>
+            <schema name="persons_common"/>
+            <schema name="persons_naturalhistory"/>
+            <prefetch>
+                persons_common:personTermGroupList/0/termDisplayName
+                persons_common:refName
+                persons_common:shortIdentifier
+            </prefetch>
+        </doctype>
+    </extension>
     
 </component>
diff --git a/services/place/3rdparty/nuxeo-platform-cs-place/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/place/3rdparty/nuxeo-platform-cs-place/src/main/resources/OSGI-INF/core-types-contrib.xml
index 799d003b1..920d6c91c 100644
--- a/services/place/3rdparty/nuxeo-platform-cs-place/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/place/3rdparty/nuxeo-platform-cs-place/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -1,25 +1,30 @@
 <?xml version="1.0"?>
 <component name="org.collectionspace.place.coreTypes">
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="placeauthorities_common" prefix="placeauthorities_common" src="schemas/placeauthorities_common.xsd"/>
-  </extension>
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="places_common" prefix="places_common" src="schemas/places_common.xsd"/>
-  </extension>
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="Placeauthority" extends="Document">
-      <schema name="common"/>
-      <schema name="collectionspace_core"/>
-      <schema name="dublincore"/>
-      <schema name="placeauthorities_common"/>
-    </doctype>
-  </extension>
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="Placeitem" extends="Document">
-      <schema name="common"/>
-      <schema name="collectionspace_core"/>
-      <schema name="dublincore"/>
-      <schema name="places_common"/>
-    </doctype>
-  </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
+        <schema name="placeauthorities_common" prefix="placeauthorities_common" src="schemas/placeauthorities_common.xsd"/>
+    </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
+        <schema name="places_common" prefix="places_common" src="schemas/places_common.xsd"/>
+    </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
+        <doctype name="Placeauthority" extends="Document">
+            <schema name="common"/>
+            <schema name="collectionspace_core"/>
+            <schema name="dublincore"/>
+            <schema name="placeauthorities_common"/>
+        </doctype>
+    </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
+        <doctype name="Placeitem" extends="Document">
+            <schema name="common"/>
+            <schema name="collectionspace_core"/>
+            <schema name="dublincore"/>
+            <schema name="places_common"/>
+            <prefetch>
+                places_common:placeTermGroupList/0/termDisplayName
+                places_common:refName
+                places_common:shortIdentifier
+            </prefetch>    
+        </doctype>
+    </extension>
 </component>
diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/core-types-contrib.xml
index 80651d22f..eb83dd9f9 100644
--- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -1,25 +1,30 @@
 <?xml version="1.0"?>
 <component name="org.collectionspace.taxonomy.coreTypes">
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="taxonomyauthority_common" prefix="taxonomyauthority_common" src="schemas/taxonomyauthority_common.xsd"/>
-  </extension>
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="taxon_common" prefix="taxon_common" src="schemas/taxon_common.xsd"/>
-  </extension>
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="Taxonomyauthority" extends="Document">
-      <schema name="common"/>
-      <schema name="collectionspace_core"/>
-      <schema name="dublincore"/>
-      <schema name="taxonomyauthority_common"/>
-    </doctype>
-  </extension>
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="Taxon" extends="Document">
-      <schema name="common"/>
-      <schema name="collectionspace_core"/>
-      <schema name="dublincore"/>
-      <schema name="taxon_common"/>
-    </doctype>
-  </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
+        <schema name="taxonomyauthority_common" prefix="taxonomyauthority_common" src="schemas/taxonomyauthority_common.xsd"/>
+    </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
+        <schema name="taxon_common" prefix="taxon_common" src="schemas/taxon_common.xsd"/>
+    </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
+        <doctype name="Taxonomyauthority" extends="Document">
+            <schema name="common"/>
+            <schema name="collectionspace_core"/>
+            <schema name="dublincore"/>
+            <schema name="taxonomyauthority_common"/>
+        </doctype>
+    </extension>
+    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
+        <doctype name="Taxon" extends="Document">
+            <schema name="common"/>
+            <schema name="collectionspace_core"/>
+            <schema name="dublincore"/>
+            <schema name="taxon_common"/>
+            <prefetch>
+                taxon_common:taxonTermGroupList/0/termDisplayName
+                taxon_common:refName
+                taxon_common:shortIdentifier
+            </prefetch>
+        </doctype>
+    </extension>
 </component>
-- 
2.47.3