From: Richard Millet <richard.millet@berkeley.edu>
Date: Sun, 4 Aug 2013 07:37:25 +0000 (-0700)
Subject: CSPACE-5678: Added fix to XMLMerge delta files to include missing tenant properties.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=5c2e632854615cdf2c4e6d78f1f7ceef028eb923;p=tmp%2Fjakarta-migration.git

CSPACE-5678: Added fix to XMLMerge delta files to include missing tenant properties.
---

diff --git a/.gitignore b/.gitignore
index 2dc9f6c89..bf27eb33b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.org.*.bindings.xml
 services/publicitem/.project
 services/publicitem/.settings/
 services/publicitem/3rdparty/.project
diff --git a/services/common/src/main/cspace/config/services/tenants/core/tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/core/tenant-bindings.delta.xml
index 783708d19..c240b7a94 100644
--- a/services/common/src/main/cspace/config/services/tenants/core/tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/core/tenant-bindings.delta.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tenant:TenantBindingConfig
-	xmlns:merge='http://xmlmerge.el4j.elca.ch'
-	xmlns:tenant='http://collectionspace.org/services/config/tenant'>
-	    	 
-    <tenant:tenantBinding id="1" name="core.collectionspace.org" displayName="CollectionSpace Core Demo Tenant" version="0.1">
-        <tenant:repositoryDomain name="default-domain" storageName="core-domain" repositoryClient="nuxeo-java" />
-    </tenant:tenantBinding>
-	    	       
+<tenant:TenantBindingConfig xmlns:merge='http://xmlmerge.el4j.elca.ch' xmlns:tenant='http://collectionspace.org/services/config/tenant'>
+
+	<tenant:tenantBinding id="1" name="core.collectionspace.org" displayName="CollectionSpace Core Demo Tenant"
+		version="0.1">
+		<tenant:repositoryDomain name="default-domain" storageName="core-domain" repositoryClient="nuxeo-java" />
+	</tenant:tenantBinding>
+
 </tenant:TenantBindingConfig>
diff --git a/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml
index e7946cac7..5b9a926f4 100644
--- a/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml
@@ -1,150 +1,120 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tenant:TenantBindingConfig
-	xmlns:merge='http://xmlmerge.el4j.elca.ch'
-	xmlns:tenant='http://collectionspace.org/services/config/tenant'>
-	    	 
-  <tenant:tenantBinding id="2" name="lifesci.collectionspace.org" displayName="Life Sciences/Natural History Demo Tenant" version="0.1">
+<tenant:TenantBindingConfig xmlns:merge='http://xmlmerge.el4j.elca.ch' xmlns:tenant='http://collectionspace.org/services/config/tenant'>
 
-    <tenant:repositoryDomain name="default-domain" storageName="lifesci_domain" repositoryName="lifesci_domain" repositoryClient="nuxeo-java" />
+	<tenant:tenantBinding id="2" name="lifesci.collectionspace.org" displayName="Life Sciences/Natural History Demo Tenant"
+		version="0.1">
 
-        <!--
-            Uncomment any setting(s) in the tenant:properties section below
-            to override system default values.
-            See tenant-bindings-proto.xml for explanation of these settings.
-        -->
-        <tenant:properties>
-            <!--
-            <types:item id="ptstartingwildcard" xmlns:types="http://collectionspace.org/services/config/types"
-                        merge:matcher="id" merge:action="replace">
-                <types:key>ptStartingWildcard</types:key>
-                <types:value>false</types:value>
-            </types:item>
-            -->
-            <!--
-            <types:item id="maxlistitemsjdbc" xmlns:types="http://collectionspace.org/services/config/types"
-                        merge:matcher="id" merge:action="replace">
-                <types:key>maxListItemsReturnedLimitOnJdbcQueries</types:key>
-                <types:value>100</types:value>
-            </types:item>
-            -->
-            <!--
-            <types:item id="jdbcqueriestenantrestricted" xmlns:types="http://collectionspace.org/services/config/types"
-                        merge:matcher="id" merge:action="replace">
-                <types:key>jdbcQueriesAreTenantIdRestricted</types:key>
-                <types:value>false</types:value>
-            </types:item>
-            -->
-        </tenant:properties>
-	
-	<tenant:serviceBindings merge:matcher="id" id="CollectionObjects">
-    <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-			<service:params>
-				<service:ListResultsFields>
-					<service:ListResultField merge:matcher="skip" merge:action="insert" >
-              <service:element>taxon</service:element>
-              <service:schema>collectionobjects_naturalhistory</service:schema>
+		<tenant:repositoryDomain name="default-domain" storageName="lifesci_domain" repositoryName="lifesci_domain"
+			repositoryClient="nuxeo-java" />
+
+		<tenant:serviceBindings merge:matcher="id" id="CollectionObjects">
+			<service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
+				<service:params>
+					<service:ListResultsFields>
+						<service:ListResultField merge:matcher="skip" merge:action="insert">
+							<service:element>taxon</service:element>
+							<service:schema>collectionobjects_naturalhistory</service:schema>
 							<service:xpath>taxonomicIdentGroupList/[0]/taxon</service:xpath>
-            </service:ListResultField>
-				</service:ListResultsFields>
-			</service:params>
-    </service:DocHandlerParams>
+						</service:ListResultField>
+					</service:ListResultsFields>
+				</service:params>
+			</service:DocHandlerParams>
 
-		<service:object xmlns:service="http://collectionspace.org/services/config/service" >
-			<service:part id="3" merge:matcher="skip" merge:action="insert" control_group="Managed" versionable="true" auditable="false" label="collectionobjects_naturalhistory" updated="" order="3">
-				<!-- Include authRefs for fields in the added schema -->
-				<service:properties>
-					<types:item xmlns:types="http://collectionspace.org/services/config/types">
-						<types:key>authRef</types:key>
-						<types:value>taxonomicIdentGroupList/*/taxon</types:value>
-					</types:item>
-					<types:item xmlns:types="http://collectionspace.org/services/config/types">
-						<types:key>authRef</types:key>
-						<types:value>associatedTaxaGroupList/*/taxon</types:value>
-					</types:item>
-					<types:item xmlns:types="http://collectionspace.org/services/config/types">
-						<types:key>authRef</types:key>
-						<types:value>taxonomicIdentGroupList/*/identBy</types:value>
-					</types:item>
-					<types:item xmlns:types="http://collectionspace.org/services/config/types">
-						<types:key>authRef</types:key>
-						<types:value>taxonomicIdentGroupList/*/institution</types:value>
-					</types:item>
-					<!--
-					<types:item xmlns:types="http://collectionspace.org/services/config/types">
-						<types:key>authRef</types:key>
-						<types:value>annotationGroupList/*/annotationAuthor</types:value>
-					</types:item>
-					 -->
-				</service:properties>
-			  <service:content contentType="application/xml">
-				<service:xmlContent namespaceURI="http://collectionspace.org/services/collectionobject/domain/naturalhistory" schemaLocation="http://collectionspace.org/services/collectionobject/domain/naturalhistory http://collectionspace.org/services/collectionobject/domain/collectionobjects_naturalhistory.xsd" />
-			  </service:content>
-			</service:part>
-		</service:object>
+			<service:object xmlns:service="http://collectionspace.org/services/config/service">
+				<service:part id="3" merge:matcher="skip" merge:action="insert" control_group="Managed" versionable="true"
+					auditable="false" label="collectionobjects_naturalhistory" updated="" order="3">
+					<!-- Include authRefs for fields in the added schema -->
+					<service:properties>
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>authRef</types:key>
+							<types:value>taxonomicIdentGroupList/*/taxon</types:value>
+						</types:item>
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>authRef</types:key>
+							<types:value>associatedTaxaGroupList/*/taxon</types:value>
+						</types:item>
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>authRef</types:key>
+							<types:value>taxonomicIdentGroupList/*/identBy</types:value>
+						</types:item>
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>authRef</types:key>
+							<types:value>taxonomicIdentGroupList/*/institution</types:value>
+						</types:item>
+						<!-- <types:item xmlns:types="http://collectionspace.org/services/config/types"> <types:key>authRef</types:key> <types:value>annotationGroupList/*/annotationAuthor</types:value> 
+							</types:item> -->
+					</service:properties>
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/collectionobject/domain/naturalhistory"
+							schemaLocation="http://collectionspace.org/services/collectionobject/domain/naturalhistory http://collectionspace.org/services/collectionobject/domain/collectionobjects_naturalhistory.xsd" />
+					</service:content>
+				</service:part>
+			</service:object>
 
-	</tenant:serviceBindings>
+		</tenant:serviceBindings>
 
-  	<tenant:serviceBindings merge:matcher="id" id="Movements">
-  		<service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-  			<service:params>
-  				<service:SupportsVersioning>true</service:SupportsVersioning>
+		<tenant:serviceBindings merge:matcher="id" id="Movements">
+			<service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
+				<service:params>
+					<service:SupportsVersioning>true</service:SupportsVersioning>
 					<service:ListResultsFields merge:action="preserve" />
-  			</service:params>
-  		</service:DocHandlerParams>
-  	</tenant:serviceBindings>
+				</service:params>
+			</service:DocHandlerParams>
+		</tenant:serviceBindings>
 
-	<tenant:serviceBindings merge:matcher="id" id="Persons">
-    <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-			<service:params>
-				<service:ListResultsFields>
-					<service:ListResultField merge:matcher="skip" merge:action="insert" >
-              <service:element>entityType</service:element>
-              <service:schema>persons_naturalhistory</service:schema>
+		<tenant:serviceBindings merge:matcher="id" id="Persons">
+			<service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
+				<service:params>
+					<service:ListResultsFields>
+						<service:ListResultField merge:matcher="skip" merge:action="insert">
+							<service:element>entityType</service:element>
+							<service:schema>persons_naturalhistory</service:schema>
 							<service:xpath>entityType</service:xpath>
-            </service:ListResultField>
-				</service:ListResultsFields>
-			</service:params>
-    </service:DocHandlerParams>
+						</service:ListResultField>
+					</service:ListResultsFields>
+				</service:params>
+			</service:DocHandlerParams>
+
+			<service:object xmlns:service="http://collectionspace.org/services/config/service">
+				<service:part id="3" merge:matcher="skip" merge:action="insert" control_group="Managed" versionable="true"
+					auditable="false" label="persons_naturalhistory" updated="" order="3">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/person/domain/naturalhistory"
+							schemaLocation="http://collectionspace.org/services/person/domain/naturalhistory http://collectionspace.org/services/person/domain/persons_naturalhistory.xsd" />
+					</service:content>
+					<service:properties>
+						<!-- See CSPACE-3938 for potential additional authRef and termRef entries -->
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>authRef</types:key>
+							<types:value>affiliatedPersonOrgGroupList/*/affiliatedPersonOrg
+							</types:value>
+						</types:item>
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>authRef</types:key>
+							<types:value>orgContactNames|orgContactName</types:value>
+						</types:item>
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>termRef</types:key>
+							<types:value>affiliatedPersonOrgGroupList/*/affiliatedPersonOrgType
+							</types:value>
+						</types:item>
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>termRef</types:key>
+							<types:value>nameTypes|nameType</types:value>
+						</types:item>
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>termRef</types:key>
+							<types:value>nameSource</types:value>
+						</types:item>
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>termRef</types:key>
+							<types:value>entityType</types:value>
+						</types:item>
+					</service:properties>
+				</service:part>
+			</service:object>
+		</tenant:serviceBindings>
+
+	</tenant:tenantBinding>
 
-		<service:object xmlns:service="http://collectionspace.org/services/config/service">
-			<service:part id="3" merge:matcher="skip" merge:action="insert" control_group="Managed"
-				versionable="true" auditable="false" label="persons_naturalhistory" updated="" order="3">
-				<service:content contentType="application/xml">
-					<service:xmlContent namespaceURI="http://collectionspace.org/services/person/domain/naturalhistory"
-						schemaLocation="http://collectionspace.org/services/person/domain/naturalhistory http://collectionspace.org/services/person/domain/persons_naturalhistory.xsd"
-					/>
-				</service:content>
-				<service:properties>
-					<!-- See CSPACE-3938 for potential additional authRef and termRef entries -->
-					<types:item xmlns:types="http://collectionspace.org/services/config/types">
-						<types:key>authRef</types:key>
-						<types:value>affiliatedPersonOrgGroupList/*/affiliatedPersonOrg</types:value>
-					</types:item>
-					<types:item xmlns:types="http://collectionspace.org/services/config/types">
-						<types:key>authRef</types:key>
-						<types:value>orgContactNames|orgContactName</types:value>
-					</types:item>
-					<types:item xmlns:types="http://collectionspace.org/services/config/types">
-						<types:key>termRef</types:key>
-						<types:value>affiliatedPersonOrgGroupList/*/affiliatedPersonOrgType</types:value>
-					</types:item>
-					<types:item xmlns:types="http://collectionspace.org/services/config/types">
-						<types:key>termRef</types:key>
-						<types:value>nameTypes|nameType</types:value>
-					</types:item>
-					<types:item xmlns:types="http://collectionspace.org/services/config/types">
-						<types:key>termRef</types:key>
-						<types:value>nameSource</types:value>
-					</types:item>
-					<types:item xmlns:types="http://collectionspace.org/services/config/types">
-						<types:key>termRef</types:key>
-						<types:value>entityType</types:value>
-					</types:item>
-				</service:properties>
-			</service:part>
-		</service:object>
-	</tenant:serviceBindings>
-	
-  </tenant:tenantBinding>
-	    	       
 </tenant:TenantBindingConfig>
diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
index 9e797ca77..2a3a413f0 100644
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
@@ -1,629 +1,704 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tenant:TenantBindingConfig xmlns:merge="http://xmlmerge.el4j.elca.ch" xmlns:tenant="http://collectionspace.org/services/config/tenant">
 
-    <tenant:tenantBinding>
+	<tenant:tenantBinding>
+		<tenant:properties>
+			<!-- Controls whether term completion (aka partial term matching, aka autocomplete) searches will automatically insert 
+				a leading wildcard. The default value is 'true', which will cause your search expression to be matched when found anywhere 
+				within a term. If this value is set to 'false', searches will only find terms which begin with your search expression. However, 
+				even with a setting of 'false', you can manually add an asterisk (*) as a wildcard at the beginning of any search; e.g. "*atrick" 
+				(without quotes) will match the string "atrick" anywhere, not just at the beginning of a term. See the tenant-bindings.delta.xml 
+				file for the 'lifesci' tenant, for examples of how to override this value, and other, similar values below, in your own tenant. -->
+			<types:item id="ptstartingwildcard" merge:matcher="skip" merge:action="insert" xmlns:types="http://collectionspace.org/services/config/types">
+				<types:key>ptStartingWildcard</types:key>
+				<types:value>true</types:value>
+			</types:item>
+			<!-- By default, term completion searches return a maximum number of terms in their search results. The default value 
+				is 40 terms. -->
+			<types:item id="maxlistitemsjdbc" merge:matcher="skip" merge:action="insert" xmlns:types="http://collectionspace.org/services/config/types">
+				<types:key>maxListItemsReturnedLimitOnJdbcQueries</types:key>
+				<types:value>40</types:value>
+			</types:item>
+			<!-- By default, term completion searches are restricted (constrained) to the current tenant. On a system where a tenant's 
+				data is isolated within its own repository, or on a shared repository system where only one tenant has data, this restriction 
+				can be removed by setting the value below to 'false'. That will remove one SQL JOIN from the query, potentially improving 
+				search performance. -->
+			<types:item id="jdbcqueriestenantrestricted" merge:matcher="skip" merge:action="insert" xmlns:types="http://collectionspace.org/services/config/types">
+				<types:key>jdbcQueriesAreTenantIdRestricted</types:key>
+				<types:value>true</types:value>
+			</types:item>
+		</tenant:properties>
 
-        <tenant:serviceBindings id="Vocabularyitems" merge:matcher="id">
-            <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-                <service:params>
-                    <service:RefnameDisplayNameField>
-                        <service:ListResultField>
-                            <service:element>order</service:element>
-                            <service:xpath>order</service:xpath>
-                        </service:ListResultField>
-                    </service:RefnameDisplayNameField>
-                </service:params>
-            </service:DocHandlerParams>
-        </tenant:serviceBindings>
-        
-        <!-- begin idgenerator service meta-data -->
-        <tenant:serviceBindings id="idgenerators" merge:matcher="id" name="idgenerators" type="utility" version="1.0">
-            <!-- other URI paths through which this service could be accessed -->
-            <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
-            <service:initHandler xmlns:service="http://collectionspace.org/services/config/service">
-                <service:classname>org.collectionspace.services.common.init.RunSqlScripts</service:classname>
-                <service:params>
-                    <service:property>
-                        <service:key>sqlScriptName</service:key>
-                        <service:value>create_id_generators_table.sql</service:value>
-                    </service:property>
-                    <service:property>
-                        <service:key>sqlScriptName</service:key>
-                        <service:value>load_id_generators.sql</service:value>
-                    </service:property>
-                </service:params>
-            </service:initHandler>
-        </tenant:serviceBindings>
-        <!-- end idgenerator service meta-data -->
+		<tenant:serviceBindings id="Vocabularyitems" merge:matcher="id">
+			<service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
+				<service:params>
+					<service:RefnameDisplayNameField>
+						<service:ListResultField>
+							<service:element>order</service:element>
+							<service:xpath>order</service:xpath>
+						</service:ListResultField>
+					</service:RefnameDisplayNameField>
+				</service:params>
+			</service:DocHandlerParams>
+		</tenant:serviceBindings>
 
-        <!-- begin id service meta-data -->
-        <tenant:serviceBindings id="id" merge:matcher="id" name="id" type="utility" version="1.0">
-            <!-- other URI paths through which this service could be accessed -->
-            <!-- 
-                <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'>
-                    /idgenerators/*/ids
-                </service:uriPath>
-            -->
-            <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
-        </tenant:serviceBindings>
-        <!-- end id service meta-data -->
+		<!-- begin idgenerator service meta-data -->
+		<tenant:serviceBindings id="idgenerators" merge:matcher="id" name="idgenerators" type="utility"
+			version="1.0">
+			<!-- other URI paths through which this service could be accessed -->
+			<service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
+			<service:initHandler xmlns:service="http://collectionspace.org/services/config/service">
+				<service:classname>org.collectionspace.services.common.init.RunSqlScripts</service:classname>
+				<service:params>
+					<service:property>
+						<service:key>sqlScriptName</service:key>
+						<service:value>create_id_generators_table.sql</service:value>
+					</service:property>
+					<service:property>
+						<service:key>sqlScriptName</service:key>
+						<service:value>load_id_generators.sql</service:value>
+					</service:property>
+				</service:params>
+			</service:initHandler>
+		</tenant:serviceBindings>
+		<!-- end idgenerator service meta-data -->
 
-        <!-- begin servicegroup service meta-data -->
-        <!-- Servicegroup is a task service that has no representation in the repo, 
-               but provides tools like keyword search across many types of services. 
-        -->
-        <tenant:serviceBindings id="servicegroups" merge:matcher="id" name="servicegroups" type="utility" version="1.0">
-            <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
-            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.servicegroup.nuxeo.ServiceGroupDocumentModelHandler</service:documentHandler>
-        </tenant:serviceBindings>
-        <!-- end servicegroup service meta-data -->
+		<!-- begin id service meta-data -->
+		<tenant:serviceBindings id="id" merge:matcher="id" name="id" type="utility" version="1.0">
+			<!-- other URI paths through which this service could be accessed -->
+			<!-- <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'> /idgenerators/*/ids </service:uriPath> -->
+			<service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
+		</tenant:serviceBindings>
+		<!-- end id service meta-data -->
 
-        <!-- begin blob service meta-data -->
-        <!-- This should likely be type="object" -->
-        <tenant:serviceBindings id="Blobs" merge:matcher="id" name="Blobs" type="utility" version="1.0">
-            <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
-            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.blob.nuxeo.BlobDocumentModelHandler</service:documentHandler>
-            <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-                <service:params>
-                    <service:ListResultsFields>
-                        <service:ListResultField>
-                            <service:element>name</service:element>
-                            <service:xpath>name</service:xpath>
-                        </service:ListResultField>
-                        <service:ListResultField>
-                            <service:element>mimeType</service:element>
-                            <service:xpath>mimeType</service:xpath>
-                        </service:ListResultField>
-                        <service:ListResultField>
-                            <service:element>encoding</service:element>
-                            <service:xpath>encoding</service:xpath>
-                        </service:ListResultField>
-                        <service:ListResultField>
-                            <service:element>length</service:element>
-                            <service:xpath>length</service:xpath>
-                        </service:ListResultField>
-                    </service:ListResultsFields>
-                </service:params>
-            </service:DocHandlerParams>
-            <service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.blob.nuxeo.BlobValidatorHandler</service:validatorHandler>
-            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="Blob" version="1.0">
-                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="blob-system" updated="" order="0">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="blobs_common" updated="" order="1">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/blob" schemaLocation="http://collectionspace.org/services/blob http://services.collectionspace.org/blob/blobs_common.xsd" />
-                        <!-- The Blob service has at least one authRef field and two or more termRef fields -->
-                        <!-- in its multivalued dimensionGroup. -->
-                        <!-- If these require enumeration here, please see authRef and termRef declarations -->
-                        <!-- in Media for relevant entries. -->
-                    </service:content>
-                </service:part>
-                <service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core" updated="" order="2">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/" schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="3" control_group="Managed" versionable="true" auditable="false" label="image_metadata" updated="" order="3">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/image_metadata/" schemaLocation="http://collectionspace.org/image_metadata/ http://services.collectionspace.org/image_metadata.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="4" control_group="Managed" versionable="true" auditable="false" label="iptc" updated="" order="4">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/iptc/" schemaLocation="http://collectionspace.org/iptc/ http://services.collectionspace.org/iptc.xsd" />
-                    </service:content>
-                </service:part>
-            </service:object>
-        </tenant:serviceBindings>
-        <!-- end blob service meta-data -->
-        
-        <!-- begin batch service meta-data -->
-        <tenant:serviceBindings id="Batch" merge:matcher="id" name="Batch" type="utility" version="1.0">
-            <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
-            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.batch.nuxeo.BatchDocumentModelHandler</service:documentHandler>
-            <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-                <service:params>
-                    <service:ListResultsFields>
-                        <service:ListResultField>
-                            <service:element>name</service:element>
-                            <service:xpath>name</service:xpath>
-                            <service:setter>setName</service:setter>
-                        </service:ListResultField>
-                    </service:ListResultsFields>
-                </service:params>
-            </service:DocHandlerParams>
-            <service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.batch.nuxeo.BatchValidatorHandler</service:validatorHandler>
-            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="Batch" version="1.0">
-                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="batch-system" updated="" order="0">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="batch_common" updated="" order="1">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/batch" schemaLocation="http://collectionspace.org/services/batch http://services.collectionspace.org/batch/batch_common.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core" updated="" order="2">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/" schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
-                    </service:content>
-                </service:part>
-            </service:object>
-        </tenant:serviceBindings>
-        <!-- end batch service meta-data -->
-        
-        <!-- begin imports service meta-data -->
-        <tenant:serviceBindings id="Imports" merge:matcher="id" name="Imports" type="utility" version="1.0">
-            <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
-            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.imports.nuxeo.ImportsDocumentModelHandler</service:documentHandler>
-            <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-                <service:params>
-                    <service:ListResultsFields>
-                        <service:ListResultField>
-                            <service:element>importsField</service:element>
-                            <service:xpath>importsField</service:xpath>
-                            <service:setter>setImportsField</service:setter>
-                        </service:ListResultField>
-                    </service:ListResultsFields>
-                </service:params>
-            </service:DocHandlerParams>
-            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="Imports" version="1.0">
-                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="imports-system" updated="" order="0">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="imports_common" updated="" order="1">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/imports" schemaLocation="http://collectionspace.org/services/imports http://services.collectionspace.org/imports/imports_common.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core" updated="" order="2">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/" schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
-                    </service:content>
-                </service:part>
-            </service:object>
-        </tenant:serviceBindings>
-        <!-- end imports service meta-data -->
-        
-        <!-- begin Workflow service meta-data -->
-        <tenant:serviceBindings id="Workflow" merge:matcher="id" name="Workflow" type="utility" version="1.0">
-            <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
-            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.common.workflow.service.nuxeo.WorkflowDocumentModelHandler</service:documentHandler>
-            <service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.workflow.nuxeo.WorkflowValidatorHandler</service:validatorHandler>
-            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="Workflow" version="1.0">
-                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="workflow-system" updated="" order="0">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="workflow_common" updated="" order="1">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/workflow" schemaLocation="http://collectionspace.org/services/workflow http://services.collectionspace.org/movement/workflow_common.xsd" />
-                    </service:content>
-                </service:part>
-            </service:object>
-        </tenant:serviceBindings>
-        <!-- end Workflow service meta-data -->
-        
-        <!-- begin report service meta-data -->
-        <tenant:serviceBindings id="Reports" merge:matcher="id" name="Reports" type="utility" version="1.0">
-            <!-- other URI paths through which this service could be accessed -->
-            <!--
-            <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'>
-                /reports/*/output/
-            </service:uriPath>-->
-            <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
-            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.report.nuxeo.ReportDocumentModelHandler</service:documentHandler>
-            <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-                <service:params>
-                    <service:ListResultsFields>
-                        <service:ListResultField>
-                            <service:element>name</service:element>
-                            <service:xpath>name</service:xpath>
-                        </service:ListResultField>
-                    </service:ListResultsFields>
-                </service:params>
-            </service:DocHandlerParams>
-            <service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.report.nuxeo.ReportValidatorHandler</service:validatorHandler>
-            <service:initHandler xmlns:service="http://collectionspace.org/services/config/service">
-                <service:classname>org.collectionspace.services.report.nuxeo.ReportPostInitHandler</service:classname>
-                <service:params>
-                    <service:property>
-                        <service:key>readerRoleName</service:key>
-                        <service:value>reader</service:value>
-                    </service:property>
-                </service:params>
-            </service:initHandler>
-            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="Report" version="1.0">
-                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="reports-system" updated="" order="0">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="reports_common" updated="" order="1">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/report" schemaLocation="http://collectionspace.org/services/report http://services.collectionspace.org/report/reports_common.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core" updated="" order="2">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/" schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
-                    </service:content>
-                </service:part>
-            </service:object>
-        </tenant:serviceBindings>
-        <!-- end report service meta-data -->
-        
-        <!-- begin relation service meta-data -->
-        <tenant:serviceBindings id="Relations" merge:matcher="id" name="Relations" type="utility" version="1.0">
-            <!-- other URI paths through which this service could be accessed -->
-            <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
-            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.relation.nuxeo.RelationDocumentModelHandler</service:documentHandler>
-            <!-- Configuration of list results fields for relation items is commented out for now, -->
-            <!-- pending resolution of how to specify nested elements in list results. -->
-            <!--
-            <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-                <service:params>
-                <service:ListResultsFields>
-                    <service:ListResultField>
-                    <service:element>subjectCsid</service:element>
-                    <service:xpath>subjectCsid</service:xpath>
-                    </service:ListResultField>
-                    <service:ListResultField>
-                    <service:element>subjectRefName</service:element>
-                    <service:xpath>subjectRefName</service:xpath>
-                    </service:ListResultField>
-                    <service:ListResultField>
-                    <service:element>relationshipType</service:element>
-                    <service:xpath>relationshipType</service:xpath>
-                    </service:ListResultField>
-                    <service:ListResultField>
-                    <service:element>predicate</service:element>
-                    <service:xpath>predicate</service:xpath>
-                    </service:ListResultField>
-                    <service:ListResultField>
-                    <service:element>predicateDisplayName</service:element>
-                    <service:xpath>predicateDisplayName</service:xpath>
-                    </service:ListResultField>
-                    <service:ListResultField>
-                    <service:element>objectCsid</service:element>
-                    <service:xpath>objectCsid</service:xpath>
-                    </service:ListResultField>
-                    <service:ListResultField>
-                    <service:element>objectRefName</service:element>
-                    <service:xpath>objectRefName</service:xpath>
-                    </service:ListResultField>
-                    <service:ListResultField>
-                    <service:element>relationshipType</service:element>
-                    <service:xpath>relationshipType</service:xpath>
-                    </service:ListResultField>
-                </service:ListResultsFields>
-                </service:params>
-            </service:DocHandlerParams>
-            -->
-            <!--
-                Relation list items can include two additional fields,
-                'subject' and 'object', each of which are parent elements of,
-                and hence containers for, as many as eight child fields.  See
-                services/jaxb/src/main/resources/relations_common.xsd
-            -->
-            <service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.relation.nuxeo.RelationValidatorHandler</service:validatorHandler>
-            <service:properties xmlns:service="http://collectionspace.org/services/config/service">
-                <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                    <types:key>objectNameProperty</types:key>
-                    <types:value>subjectCsid</types:value>
-                </types:item>
-                <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                    <types:key>objectNumberProperty</types:key>
-                    <types:value>predicateDisplayName</types:value>
-                </types:item>
-            </service:properties>
-            <service:initHandler xmlns:service="http://collectionspace.org/services/config/service">
-                <service:classname>org.collectionspace.services.common.init.AddIndices</service:classname>
-                <service:params>
-                    <service:field>
-                        <service:table>relations_common</service:table>
-                        <service:param>subjectcsid,objectcsid</service:param>
-                    </service:field>
-                </service:params>
-            </service:initHandler>
-            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="Relation" version="1.0">
-                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="relations-system" updated="" order="0">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="relations_common" updated="" order="1">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/relation" schemaLocation="http://collectionspace.org/services/relation http://services.collectionspace.org/relation/relations_common.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core" updated="" order="2">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/" schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
-                    </service:content>
-                </service:part>
-            </service:object>
-        </tenant:serviceBindings>
-        <!-- end relation service meta-data -->
+		<!-- begin servicegroup service meta-data -->
+		<!-- Servicegroup is a task service that has no representation in the repo, but provides tools like keyword search across 
+			many types of services. -->
+		<tenant:serviceBindings id="servicegroups" merge:matcher="id" name="servicegroups" type="utility"
+			version="1.0">
+			<service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
+			<service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.servicegroup.nuxeo.ServiceGroupDocumentModelHandler
+			</service:documentHandler>
+		</tenant:serviceBindings>
+		<!-- end servicegroup service meta-data -->
 
-        <!-- begin dimension service meta-data -->
-        <tenant:serviceBindings id="Dimensions" merge:matcher="id" name="Dimensions" type="utility" version="1.0">
-            <!-- other URI paths through which this service could be accessed -->
-            <service:uriPath xmlns:service="http://collectionspace.org/services/config/service">/dimensions/workflow/</service:uriPath>
-            <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
-            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.dimension.nuxeo.DimensionDocumentModelHandler</service:documentHandler>
-            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="Dimension" version="1.0">
-                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="dimensions-system" updated="" order="0">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="dimensions_common" updated="" order="1">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/dimension" schemaLocation="http://collectionspace.org/services/dimension http://services.collectionspace.org/dimension/dimensions_common.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core" updated="" order="2">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/" schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
-                    </service:content>
-                </service:part>
-            </service:object>
-        </tenant:serviceBindings>
-        <!-- end dimension service meta-data -->
-        
-        <!-- begin contact service meta-data -->
-        <tenant:serviceBindings id="Contacts" merge:matcher="id" name="Contacts" type="utility" version="1.0">
-            <!-- other URI paths through which this service could be accessed -->
-            <!--
-            <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'>
-                /personauthorities/*/items/*/contacts
-            </service:uriPath>
-            <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'>
-                /orgauthorities/*/items/*/contacts
-            </service:uriPath>
-            -->
-            <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
-            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.contact.nuxeo.ContactDocumentModelHandler</service:documentHandler>
-            <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-                <service:params>
-                    <service:ListResultsFields>
-                        <service:ListResultField>
-                            <service:element>displayName</service:element>
-                            <service:xpath>displayName</service:xpath>
-                        </service:ListResultField>
-                    </service:ListResultsFields>
-                </service:params>
-            </service:DocHandlerParams>
-            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="Contact" version="1.0">
-                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="contacts-system" updated="" order="0">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="contacts_common" updated="" order="1">
-                    <service:properties>
-                        <!-- Fields containing authority term references -->
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>authRef</types:key>
-                            <types:value>addressGroupList/*/addressMunicipality</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>authRef</types:key>
-                            <types:value>addressGroupList/*/addressStateOrProvince</types:value>
-                        </types:item>
-                        <!-- Per CSPACE-5080: This field is configured as a term list, rather than being tied to Place authority as described in wiki schema -->
-                        <!--<types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>authRef</types:key>
-                            <types:value>addressGroupList/*/addressCountry</types:value>
-                        </types:item> -->
-                        <!-- Fields containing term list / controlled vocabulary references -->
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>termRef</types:key>
-                            <types:value>emailGroupList/*/emailType</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>termRef</types:key>
-                            <types:value>telephoneNumberGroupList/*/telephoneNumberType</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>termRef</types:key>
-                            <types:value>faxNumberGroupList/*/faxNumberType</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>termRef</types:key>
-                            <types:value>webAddressGroupList/*/webAddressType</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>termRef</types:key>
-                            <types:value>addressGroupList/*/addressCountry</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>termRef</types:key>
-                            <types:value>addressGroupList/*/addressType</types:value>
-                        </types:item>
-                    </service:properties>
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/contact" schemaLocation="http://collectionspace.org/services/contact http://services.collectionspace.org/contact/contacts_common.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core" updated="" order="2">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/" schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
-                    </service:content>
-                </service:part>
-            </service:object>
-        </tenant:serviceBindings>
-        <!-- end contact service meta-data -->
+		<!-- begin blob service meta-data -->
+		<!-- This should likely be type="object" -->
+		<tenant:serviceBindings id="Blobs" merge:matcher="id" name="Blobs" type="utility" version="1.0">
+			<service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
+			<service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.blob.nuxeo.BlobDocumentModelHandler
+			</service:documentHandler>
+			<service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
+				<service:params>
+					<service:ListResultsFields>
+						<service:ListResultField>
+							<service:element>name</service:element>
+							<service:xpath>name</service:xpath>
+						</service:ListResultField>
+						<service:ListResultField>
+							<service:element>mimeType</service:element>
+							<service:xpath>mimeType</service:xpath>
+						</service:ListResultField>
+						<service:ListResultField>
+							<service:element>encoding</service:element>
+							<service:xpath>encoding</service:xpath>
+						</service:ListResultField>
+						<service:ListResultField>
+							<service:element>length</service:element>
+							<service:xpath>length</service:xpath>
+						</service:ListResultField>
+					</service:ListResultsFields>
+				</service:params>
+			</service:DocHandlerParams>
+			<service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.blob.nuxeo.BlobValidatorHandler
+			</service:validatorHandler>
+			<service:object xmlns:service="http://collectionspace.org/services/config/service" name="Blob"
+				version="1.0">
+				<service:part id="0" control_group="Managed" versionable="true" auditable="false" label="blob-system"
+					updated="" order="0">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/config/system"
+							schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="1" control_group="Managed" versionable="true" auditable="false" label="blobs_common"
+					updated="" order="1">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/blob"
+							schemaLocation="http://collectionspace.org/services/blob http://services.collectionspace.org/blob/blobs_common.xsd" />
+						<!-- The Blob service has at least one authRef field and two or more termRef fields -->
+						<!-- in its multivalued dimensionGroup. -->
+						<!-- If these require enumeration here, please see authRef and termRef declarations -->
+						<!-- in Media for relevant entries. -->
+					</service:content>
+				</service:part>
+				<service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core"
+					updated="" order="2">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/"
+							schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="3" control_group="Managed" versionable="true" auditable="false" label="image_metadata"
+					updated="" order="3">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/image_metadata/"
+							schemaLocation="http://collectionspace.org/image_metadata/ http://services.collectionspace.org/image_metadata.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="4" control_group="Managed" versionable="true" auditable="false" label="iptc" updated=""
+					order="4">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/iptc/"
+							schemaLocation="http://collectionspace.org/iptc/ http://services.collectionspace.org/iptc.xsd" />
+					</service:content>
+				</service:part>
+			</service:object>
+		</tenant:serviceBindings>
+		<!-- end blob service meta-data -->
 
-        <!-- begin role service meta-data -->
-        <tenant:serviceBindings id="authorization/roles" merge:matcher="id" name="authorization/roles" type="security" version="1.0">
-            <!-- other URI paths through which this service could be accessed -->
-            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.authorization.storage.RoleDocumentHandler</service:documentHandler>
-            <service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.authorization.storage.RoleValidatorHandler</service:validatorHandler>
-            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="Role" version="1.0">
-                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="roles_system" updated="" order="0">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="roles" updated="" order="1">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/authorization" schemaLocation="http://collectionspace.org/services/authorization http://services.collectionspace.org/authorization/roles.xsd" />
-                    </service:content>
-                </service:part>
-            </service:object>
-        </tenant:serviceBindings>
-        <!-- end role service meta-data -->
-        
-        <!-- begin permission service meta-data -->
-        <tenant:serviceBindings id="authorization/permissions" merge:matcher="id" name="authorization/permissions" type="security" version="1.0">
-            <!-- other URI paths through which this service could be accessed -->
-            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.authorization.storage.PermissionDocumentHandler</service:documentHandler>
-            <service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.authorization.storage.PermissionValidatorHandler</service:validatorHandler>
-            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="Permission" version="1.0">
-                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="permissions_system" updated="" order="0">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="permissions" updated="" order="1">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/authorization" schemaLocation="http://collectionspace.org/services/authorization http://services.collectionspace.org/authorization/permissions.xsd" />
-                    </service:content>
-                </service:part>
-            </service:object>
-        </tenant:serviceBindings>
-        <!-- end permission service meta-data -->
-        
-        <!-- begin permission-role service meta-data -->
-        <!-- the following service is same as authorization/roles/permroles service -->
-        <!-- except that it is available as a sub resource of the permission service -->
-        <tenant:serviceBindings id="authorization/permissions/permroles" merge:matcher="id" name="authorization/permissions/permroles" type="security" version="1.0">
-            <!-- other URI paths through which this service could be accessed -->
-            <!--
-            <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'>
-                /authorization/permissions/*/permroles/
-            </service:uriPath>
-            -->
-            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.authorization.storage.PermissionRoleDocumentHandler</service:documentHandler>
-            <!--
-            <service:validatorHandler xmlns:service='http://collectionspace.org/services/config/service'>
-                org.collectionspace.services.authorization.storage.PermissionRoleValidatorHandler
-            </service:validatorHandler>
-            -->
-            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="PermissionRole" version="1.0">
-                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="permroles_system" updated="" order="0">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="permroles" updated="" order="1">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/authorization" schemaLocation="http://collectionspace.org/services/authorization http://services.collectionspace.org/authorization/permissions_roles.xsd" />
-                    </service:content>
-                </service:part>
-            </service:object>
-        </tenant:serviceBindings>
-        <!-- end permission-role service meta-data -->
-        
-        <!-- begin account-role service meta-data -->
-        <tenant:serviceBindings id="accounts/accountroles" merge:matcher="id" name="accounts/accountroles" type="security" version="1.0">
-            <!-- other URI paths through which this service could be accessed -->
-            <!--
-            <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'>
-                /accounts/*/accountroles/
-            </service:uriPath>
-            -->
-            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.account.storage.AccountRoleDocumentHandler</service:documentHandler>
-            <!--
-            <service:validatorHandler xmlns:service='http://collectionspace.org/services/config/service'>
-                org.collectionspace.services.account.storage.AccountRoleDocumentHandler
-            </service:validatorHandler>
-            -->
-            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="AccountRole" version="1.0">
-                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="accountroles_system" updated="" order="0">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="accountroles" updated="" order="1">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/authorization" schemaLocation="http://collectionspace.org/services/authorization http://services.collectionspace.org/authorization/accounts_roles.xsd" />
-                    </service:content>
-                </service:part>
-            </service:object>
-        </tenant:serviceBindings>
-        <!-- end account-role service meta-data -->
-        
-        <!-- begin role-permission service meta-data -->
-        <!-- the following service is same as authorization/permissions/permroles service -->
-        <!-- except that it is available as a sub resource of the role service -->
-        <tenant:serviceBindings id="authorization/roles/permroles" merge:matcher="id" name="authorization/roles/permroles" type="security" version="1.0">
-            <!-- other URI paths through which this service could be accessed -->
-            <!--
-            <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'>
-                /authorization/roles/*/permroles/
-            </service:uriPath>
-            -->
-            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.authorization.storage.PermissionRoleDocumentHandler</service:documentHandler>
-            <!--
-            <service:validatorHandler xmlns:service='http://collectionspace.org/services/config/service'>
-                org.collectionspace.services.authorization.storage.PermissionRoleValidatorHandler
-            </service:validatorHandler>
-            -->
-            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="PermissionRole" version="1.0">
-                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="permroles_system" updated="" order="0">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="permroles" updated="" order="1">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/authorization" schemaLocation="http://collectionspace.org/services/authorization http://services.collectionspace.org/authorization/permissions_roles.xsd" />
-                    </service:content>
-                </service:part>
-            </service:object>
-        </tenant:serviceBindings>
-        <!-- end role-permission service meta-data -->
-        
-        <!-- begin role-account service meta-data -->
-        <!-- the following service is same as account/accountroles service -->
-        <!-- except that it is available as a sub resource of the role service -->
-        <tenant:serviceBindings id="authorization/roles/accountroles" merge:matcher="id" name="authorization/roles/accountroles" type="security" version="1.0">
-            <!-- other URI paths through which this service could be accessed -->
-            <!--
-            <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'>
-                /authorization/roles/*/accountroles/
-            </service:uriPath>
-            -->
-            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.account.storage.AccountRoleDocumentHandler</service:documentHandler>
-            <!--
-            <service:validatorHandler xmlns:service='http://collectionspace.org/services/config/service'>
-                org.collectionspace.services.authorization.storage.PermissionRoleValidatorHandler
-            </service:validatorHandler>
-            -->
-            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="AccountRole" version="1.0">
-                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="accountroles_system" updated="" order="0">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
-                    </service:content>
-                </service:part>
-                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="accountroles" updated="" order="1">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/authorization" schemaLocation="http://collectionspace.org/services/authorization http://services.collectionspace.org/authorization/accounts_roles.xsd" />
-                    </service:content>
-                </service:part>
-            </service:object>
-        </tenant:serviceBindings>
+		<!-- begin batch service meta-data -->
+		<tenant:serviceBindings id="Batch" merge:matcher="id" name="Batch" type="utility" version="1.0">
+			<service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
+			<service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.batch.nuxeo.BatchDocumentModelHandler
+			</service:documentHandler>
+			<service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
+				<service:params>
+					<service:ListResultsFields>
+						<service:ListResultField>
+							<service:element>name</service:element>
+							<service:xpath>name</service:xpath>
+							<service:setter>setName</service:setter>
+						</service:ListResultField>
+					</service:ListResultsFields>
+				</service:params>
+			</service:DocHandlerParams>
+			<service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.batch.nuxeo.BatchValidatorHandler
+			</service:validatorHandler>
+			<service:object xmlns:service="http://collectionspace.org/services/config/service" name="Batch"
+				version="1.0">
+				<service:part id="0" control_group="Managed" versionable="true" auditable="false" label="batch-system"
+					updated="" order="0">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/config/system"
+							schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="1" control_group="Managed" versionable="true" auditable="false" label="batch_common"
+					updated="" order="1">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/batch"
+							schemaLocation="http://collectionspace.org/services/batch http://services.collectionspace.org/batch/batch_common.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core"
+					updated="" order="2">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/"
+							schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
+					</service:content>
+				</service:part>
+			</service:object>
+		</tenant:serviceBindings>
+		<!-- end batch service meta-data -->
 
-    </tenant:tenantBinding>
+		<!-- begin imports service meta-data -->
+		<tenant:serviceBindings id="Imports" merge:matcher="id" name="Imports" type="utility" version="1.0">
+			<service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
+			<service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.imports.nuxeo.ImportsDocumentModelHandler
+			</service:documentHandler>
+			<service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
+				<service:params>
+					<service:ListResultsFields>
+						<service:ListResultField>
+							<service:element>importsField</service:element>
+							<service:xpath>importsField</service:xpath>
+							<service:setter>setImportsField</service:setter>
+						</service:ListResultField>
+					</service:ListResultsFields>
+				</service:params>
+			</service:DocHandlerParams>
+			<service:object xmlns:service="http://collectionspace.org/services/config/service" name="Imports"
+				version="1.0">
+				<service:part id="0" control_group="Managed" versionable="true" auditable="false" label="imports-system"
+					updated="" order="0">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/config/system"
+							schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="1" control_group="Managed" versionable="true" auditable="false" label="imports_common"
+					updated="" order="1">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/imports"
+							schemaLocation="http://collectionspace.org/services/imports http://services.collectionspace.org/imports/imports_common.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core"
+					updated="" order="2">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/"
+							schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
+					</service:content>
+				</service:part>
+			</service:object>
+		</tenant:serviceBindings>
+		<!-- end imports service meta-data -->
+
+		<!-- begin Workflow service meta-data -->
+		<tenant:serviceBindings id="Workflow" merge:matcher="id" name="Workflow" type="utility"
+			version="1.0">
+			<service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
+			<service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.common.workflow.service.nuxeo.WorkflowDocumentModelHandler
+			</service:documentHandler>
+			<service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.workflow.nuxeo.WorkflowValidatorHandler
+			</service:validatorHandler>
+			<service:object xmlns:service="http://collectionspace.org/services/config/service" name="Workflow"
+				version="1.0">
+				<service:part id="0" control_group="Managed" versionable="true" auditable="false" label="workflow-system"
+					updated="" order="0">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/config/system"
+							schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="1" control_group="Managed" versionable="true" auditable="false" label="workflow_common"
+					updated="" order="1">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/workflow"
+							schemaLocation="http://collectionspace.org/services/workflow http://services.collectionspace.org/movement/workflow_common.xsd" />
+					</service:content>
+				</service:part>
+			</service:object>
+		</tenant:serviceBindings>
+		<!-- end Workflow service meta-data -->
+
+		<!-- begin report service meta-data -->
+		<tenant:serviceBindings id="Reports" merge:matcher="id" name="Reports" type="utility" version="1.0">
+			<!-- other URI paths through which this service could be accessed -->
+			<!-- <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'> /reports/*/output/ </service:uriPath> -->
+			<service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
+			<service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.report.nuxeo.ReportDocumentModelHandler
+			</service:documentHandler>
+			<service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
+				<service:params>
+					<service:ListResultsFields>
+						<service:ListResultField>
+							<service:element>name</service:element>
+							<service:xpath>name</service:xpath>
+						</service:ListResultField>
+					</service:ListResultsFields>
+				</service:params>
+			</service:DocHandlerParams>
+			<service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.report.nuxeo.ReportValidatorHandler
+			</service:validatorHandler>
+			<service:initHandler xmlns:service="http://collectionspace.org/services/config/service">
+				<service:classname>org.collectionspace.services.report.nuxeo.ReportPostInitHandler</service:classname>
+				<service:params>
+					<service:property>
+						<service:key>readerRoleName</service:key>
+						<service:value>reader</service:value>
+					</service:property>
+				</service:params>
+			</service:initHandler>
+			<service:object xmlns:service="http://collectionspace.org/services/config/service" name="Report"
+				version="1.0">
+				<service:part id="0" control_group="Managed" versionable="true" auditable="false" label="reports-system"
+					updated="" order="0">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/config/system"
+							schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="1" control_group="Managed" versionable="true" auditable="false" label="reports_common"
+					updated="" order="1">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/report"
+							schemaLocation="http://collectionspace.org/services/report http://services.collectionspace.org/report/reports_common.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core"
+					updated="" order="2">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/"
+							schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
+					</service:content>
+				</service:part>
+			</service:object>
+		</tenant:serviceBindings>
+		<!-- end report service meta-data -->
+
+		<!-- begin relation service meta-data -->
+		<tenant:serviceBindings id="Relations" merge:matcher="id" name="Relations" type="utility"
+			version="1.0">
+			<!-- other URI paths through which this service could be accessed -->
+			<service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
+			<service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.relation.nuxeo.RelationDocumentModelHandler
+			</service:documentHandler>
+			<!-- Configuration of list results fields for relation items is commented out for now, -->
+			<!-- pending resolution of how to specify nested elements in list results. -->
+			<!-- <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service"> <service:params> <service:ListResultsFields> 
+				<service:ListResultField> <service:element>subjectCsid</service:element> <service:xpath>subjectCsid</service:xpath> </service:ListResultField> 
+				<service:ListResultField> <service:element>subjectRefName</service:element> <service:xpath>subjectRefName</service:xpath> 
+				</service:ListResultField> <service:ListResultField> <service:element>relationshipType</service:element> <service:xpath>relationshipType</service:xpath> 
+				</service:ListResultField> <service:ListResultField> <service:element>predicate</service:element> <service:xpath>predicate</service:xpath> 
+				</service:ListResultField> <service:ListResultField> <service:element>predicateDisplayName</service:element> <service:xpath>predicateDisplayName</service:xpath> 
+				</service:ListResultField> <service:ListResultField> <service:element>objectCsid</service:element> <service:xpath>objectCsid</service:xpath> 
+				</service:ListResultField> <service:ListResultField> <service:element>objectRefName</service:element> <service:xpath>objectRefName</service:xpath> 
+				</service:ListResultField> <service:ListResultField> <service:element>relationshipType</service:element> <service:xpath>relationshipType</service:xpath> 
+				</service:ListResultField> </service:ListResultsFields> </service:params> </service:DocHandlerParams> -->
+			<!-- Relation list items can include two additional fields, 'subject' and 'object', each of which are parent elements 
+				of, and hence containers for, as many as eight child fields. See services/jaxb/src/main/resources/relations_common.xsd -->
+			<service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.relation.nuxeo.RelationValidatorHandler
+			</service:validatorHandler>
+			<service:properties xmlns:service="http://collectionspace.org/services/config/service">
+				<types:item xmlns:types="http://collectionspace.org/services/config/types">
+					<types:key>objectNameProperty</types:key>
+					<types:value>subjectCsid</types:value>
+				</types:item>
+				<types:item xmlns:types="http://collectionspace.org/services/config/types">
+					<types:key>objectNumberProperty</types:key>
+					<types:value>predicateDisplayName</types:value>
+				</types:item>
+			</service:properties>
+			<service:initHandler xmlns:service="http://collectionspace.org/services/config/service">
+				<service:classname>org.collectionspace.services.common.init.AddIndices</service:classname>
+				<service:params>
+					<service:field>
+						<service:table>relations_common</service:table>
+						<service:param>subjectcsid,objectcsid</service:param>
+					</service:field>
+				</service:params>
+			</service:initHandler>
+			<service:object xmlns:service="http://collectionspace.org/services/config/service" name="Relation"
+				version="1.0">
+				<service:part id="0" control_group="Managed" versionable="true" auditable="false" label="relations-system"
+					updated="" order="0">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/config/system"
+							schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="1" control_group="Managed" versionable="true" auditable="false" label="relations_common"
+					updated="" order="1">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/relation"
+							schemaLocation="http://collectionspace.org/services/relation http://services.collectionspace.org/relation/relations_common.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core"
+					updated="" order="2">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/"
+							schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
+					</service:content>
+				</service:part>
+			</service:object>
+		</tenant:serviceBindings>
+		<!-- end relation service meta-data -->
+
+		<!-- begin dimension service meta-data -->
+		<tenant:serviceBindings id="Dimensions" merge:matcher="id" name="Dimensions" type="utility"
+			version="1.0">
+			<!-- other URI paths through which this service could be accessed -->
+			<service:uriPath xmlns:service="http://collectionspace.org/services/config/service">/dimensions/workflow/</service:uriPath>
+			<service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
+			<service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.dimension.nuxeo.DimensionDocumentModelHandler
+			</service:documentHandler>
+			<service:object xmlns:service="http://collectionspace.org/services/config/service" name="Dimension"
+				version="1.0">
+				<service:part id="0" control_group="Managed" versionable="true" auditable="false" label="dimensions-system"
+					updated="" order="0">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/config/system"
+							schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="1" control_group="Managed" versionable="true" auditable="false" label="dimensions_common"
+					updated="" order="1">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/dimension"
+							schemaLocation="http://collectionspace.org/services/dimension http://services.collectionspace.org/dimension/dimensions_common.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core"
+					updated="" order="2">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/"
+							schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
+					</service:content>
+				</service:part>
+			</service:object>
+		</tenant:serviceBindings>
+		<!-- end dimension service meta-data -->
+
+		<!-- begin contact service meta-data -->
+		<tenant:serviceBindings id="Contacts" merge:matcher="id" name="Contacts" type="utility"
+			version="1.0">
+			<!-- other URI paths through which this service could be accessed -->
+			<!-- <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'> /personauthorities/*/items/*/contacts 
+				</service:uriPath> <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'> /orgauthorities/*/items/*/contacts 
+				</service:uriPath> -->
+			<service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
+			<service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.contact.nuxeo.ContactDocumentModelHandler
+			</service:documentHandler>
+			<service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
+				<service:params>
+					<service:ListResultsFields>
+						<service:ListResultField>
+							<service:element>displayName</service:element>
+							<service:xpath>displayName</service:xpath>
+						</service:ListResultField>
+					</service:ListResultsFields>
+				</service:params>
+			</service:DocHandlerParams>
+			<service:object xmlns:service="http://collectionspace.org/services/config/service" name="Contact"
+				version="1.0">
+				<service:part id="0" control_group="Managed" versionable="true" auditable="false" label="contacts-system"
+					updated="" order="0">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/config/system"
+							schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="1" control_group="Managed" versionable="true" auditable="false" label="contacts_common"
+					updated="" order="1">
+					<service:properties>
+						<!-- Fields containing authority term references -->
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>authRef</types:key>
+							<types:value>addressGroupList/*/addressMunicipality</types:value>
+						</types:item>
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>authRef</types:key>
+							<types:value>addressGroupList/*/addressStateOrProvince</types:value>
+						</types:item>
+						<!-- Per CSPACE-5080: This field is configured as a term list, rather than being tied to Place authority as described 
+							in wiki schema -->
+						<!--<types:item xmlns:types="http://collectionspace.org/services/config/types"> <types:key>authRef</types:key> <types:value>addressGroupList/*/addressCountry</types:value> 
+							</types:item> -->
+						<!-- Fields containing term list / controlled vocabulary references -->
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>termRef</types:key>
+							<types:value>emailGroupList/*/emailType</types:value>
+						</types:item>
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>termRef</types:key>
+							<types:value>telephoneNumberGroupList/*/telephoneNumberType</types:value>
+						</types:item>
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>termRef</types:key>
+							<types:value>faxNumberGroupList/*/faxNumberType</types:value>
+						</types:item>
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>termRef</types:key>
+							<types:value>webAddressGroupList/*/webAddressType</types:value>
+						</types:item>
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>termRef</types:key>
+							<types:value>addressGroupList/*/addressCountry</types:value>
+						</types:item>
+						<types:item xmlns:types="http://collectionspace.org/services/config/types">
+							<types:key>termRef</types:key>
+							<types:value>addressGroupList/*/addressType</types:value>
+						</types:item>
+					</service:properties>
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/contact"
+							schemaLocation="http://collectionspace.org/services/contact http://services.collectionspace.org/contact/contacts_common.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core"
+					updated="" order="2">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/"
+							schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
+					</service:content>
+				</service:part>
+			</service:object>
+		</tenant:serviceBindings>
+		<!-- end contact service meta-data -->
+
+		<!-- begin role service meta-data -->
+		<tenant:serviceBindings id="authorization/roles" merge:matcher="id" name="authorization/roles"
+			type="security" version="1.0">
+			<!-- other URI paths through which this service could be accessed -->
+			<service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.authorization.storage.RoleDocumentHandler
+			</service:documentHandler>
+			<service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.authorization.storage.RoleValidatorHandler
+			</service:validatorHandler>
+			<service:object xmlns:service="http://collectionspace.org/services/config/service" name="Role"
+				version="1.0">
+				<service:part id="0" control_group="Managed" versionable="true" auditable="false" label="roles_system"
+					updated="" order="0">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/config/system"
+							schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="1" control_group="Managed" versionable="true" auditable="false" label="roles"
+					updated="" order="1">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/authorization"
+							schemaLocation="http://collectionspace.org/services/authorization http://services.collectionspace.org/authorization/roles.xsd" />
+					</service:content>
+				</service:part>
+			</service:object>
+		</tenant:serviceBindings>
+		<!-- end role service meta-data -->
+
+		<!-- begin permission service meta-data -->
+		<tenant:serviceBindings id="authorization/permissions" merge:matcher="id"
+			name="authorization/permissions" type="security" version="1.0">
+			<!-- other URI paths through which this service could be accessed -->
+			<service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.authorization.storage.PermissionDocumentHandler
+			</service:documentHandler>
+			<service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.authorization.storage.PermissionValidatorHandler
+			</service:validatorHandler>
+			<service:object xmlns:service="http://collectionspace.org/services/config/service" name="Permission"
+				version="1.0">
+				<service:part id="0" control_group="Managed" versionable="true" auditable="false" label="permissions_system"
+					updated="" order="0">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/config/system"
+							schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="1" control_group="Managed" versionable="true" auditable="false" label="permissions"
+					updated="" order="1">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/authorization"
+							schemaLocation="http://collectionspace.org/services/authorization http://services.collectionspace.org/authorization/permissions.xsd" />
+					</service:content>
+				</service:part>
+			</service:object>
+		</tenant:serviceBindings>
+		<!-- end permission service meta-data -->
+
+		<!-- begin permission-role service meta-data -->
+		<!-- the following service is same as authorization/roles/permroles service -->
+		<!-- except that it is available as a sub resource of the permission service -->
+		<tenant:serviceBindings id="authorization/permissions/permroles" merge:matcher="id"
+			name="authorization/permissions/permroles" type="security" version="1.0">
+			<!-- other URI paths through which this service could be accessed -->
+			<!-- <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'> /authorization/permissions/*/permroles/ 
+				</service:uriPath> -->
+			<service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.authorization.storage.PermissionRoleDocumentHandler
+			</service:documentHandler>
+			<!-- <service:validatorHandler xmlns:service='http://collectionspace.org/services/config/service'> org.collectionspace.services.authorization.storage.PermissionRoleValidatorHandler 
+				</service:validatorHandler> -->
+			<service:object xmlns:service="http://collectionspace.org/services/config/service" name="PermissionRole"
+				version="1.0">
+				<service:part id="0" control_group="Managed" versionable="true" auditable="false" label="permroles_system"
+					updated="" order="0">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/config/system"
+							schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="1" control_group="Managed" versionable="true" auditable="false" label="permroles"
+					updated="" order="1">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/authorization"
+							schemaLocation="http://collectionspace.org/services/authorization http://services.collectionspace.org/authorization/permissions_roles.xsd" />
+					</service:content>
+				</service:part>
+			</service:object>
+		</tenant:serviceBindings>
+		<!-- end permission-role service meta-data -->
+
+		<!-- begin account-role service meta-data -->
+		<tenant:serviceBindings id="accounts/accountroles" merge:matcher="id" name="accounts/accountroles"
+			type="security" version="1.0">
+			<!-- other URI paths through which this service could be accessed -->
+			<!-- <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'> /accounts/*/accountroles/ </service:uriPath> -->
+			<service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.account.storage.AccountRoleDocumentHandler
+			</service:documentHandler>
+			<!-- <service:validatorHandler xmlns:service='http://collectionspace.org/services/config/service'> org.collectionspace.services.account.storage.AccountRoleDocumentHandler 
+				</service:validatorHandler> -->
+			<service:object xmlns:service="http://collectionspace.org/services/config/service" name="AccountRole"
+				version="1.0">
+				<service:part id="0" control_group="Managed" versionable="true" auditable="false" label="accountroles_system"
+					updated="" order="0">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/config/system"
+							schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="1" control_group="Managed" versionable="true" auditable="false" label="accountroles"
+					updated="" order="1">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/authorization"
+							schemaLocation="http://collectionspace.org/services/authorization http://services.collectionspace.org/authorization/accounts_roles.xsd" />
+					</service:content>
+				</service:part>
+			</service:object>
+		</tenant:serviceBindings>
+		<!-- end account-role service meta-data -->
+
+		<!-- begin role-permission service meta-data -->
+		<!-- the following service is same as authorization/permissions/permroles service -->
+		<!-- except that it is available as a sub resource of the role service -->
+		<tenant:serviceBindings id="authorization/roles/permroles" merge:matcher="id"
+			name="authorization/roles/permroles" type="security" version="1.0">
+			<!-- other URI paths through which this service could be accessed -->
+			<!-- <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'> /authorization/roles/*/permroles/ 
+				</service:uriPath> -->
+			<service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.authorization.storage.PermissionRoleDocumentHandler
+			</service:documentHandler>
+			<!-- <service:validatorHandler xmlns:service='http://collectionspace.org/services/config/service'> org.collectionspace.services.authorization.storage.PermissionRoleValidatorHandler 
+				</service:validatorHandler> -->
+			<service:object xmlns:service="http://collectionspace.org/services/config/service" name="PermissionRole"
+				version="1.0">
+				<service:part id="0" control_group="Managed" versionable="true" auditable="false" label="permroles_system"
+					updated="" order="0">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/config/system"
+							schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="1" control_group="Managed" versionable="true" auditable="false" label="permroles"
+					updated="" order="1">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/authorization"
+							schemaLocation="http://collectionspace.org/services/authorization http://services.collectionspace.org/authorization/permissions_roles.xsd" />
+					</service:content>
+				</service:part>
+			</service:object>
+		</tenant:serviceBindings>
+		<!-- end role-permission service meta-data -->
+
+		<!-- begin role-account service meta-data -->
+		<!-- the following service is same as account/accountroles service -->
+		<!-- except that it is available as a sub resource of the role service -->
+		<tenant:serviceBindings id="authorization/roles/accountroles" merge:matcher="id"
+			name="authorization/roles/accountroles" type="security" version="1.0">
+			<!-- other URI paths through which this service could be accessed -->
+			<!-- <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'> /authorization/roles/*/accountroles/ 
+				</service:uriPath> -->
+			<service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.account.storage.AccountRoleDocumentHandler
+			</service:documentHandler>
+			<!-- <service:validatorHandler xmlns:service='http://collectionspace.org/services/config/service'> org.collectionspace.services.authorization.storage.PermissionRoleValidatorHandler 
+				</service:validatorHandler> -->
+			<service:object xmlns:service="http://collectionspace.org/services/config/service" name="AccountRole"
+				version="1.0">
+				<service:part id="0" control_group="Managed" versionable="true" auditable="false" label="accountroles_system"
+					updated="" order="0">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/config/system"
+							schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
+					</service:content>
+				</service:part>
+				<service:part id="1" control_group="Managed" versionable="true" auditable="false" label="accountroles"
+					updated="" order="1">
+					<service:content contentType="application/xml">
+						<service:xmlContent namespaceURI="http://collectionspace.org/services/authorization"
+							schemaLocation="http://collectionspace.org/services/authorization http://services.collectionspace.org/authorization/accounts_roles.xsd" />
+					</service:content>
+				</service:part>
+			</service:object>
+		</tenant:serviceBindings>
+
+	</tenant:tenantBinding>
 
 </tenant:TenantBindingConfig>