From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 29 Nov 2012 21:31:06 +0000 (-0800)
Subject: CSPACE-5733: Moved vocabularyitems service to a new 'vocabulary' service type, thus... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=c478cc742cc165a63c11f341d2366d02e75e51d2;p=tmp%2Fjakarta-migration.git

CSPACE-5733: Moved vocabularyitems service to a new 'vocabulary' service type, thus pulling it out of the 'authority' type (and hence also out of the 'common' set of types, when authority services are optionally included in that set). Service types are currently used just in identifying document types to be scanned for authority references (refObjs) and in all records search, and in neither of these contexts should vocabularyitem records be included. We can either revert this change or include vocabularyitems in future sets as needed by future functionality.
---

diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
index 2d59ce237..c295417f8 100644
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
@@ -1529,7 +1529,7 @@
             Note there is no Vocabularyitem service, but there is a
             Repository workspace so we have to configure that.
         -->
-        <tenant:serviceBindings id="Vocabularyitems" name="Vocabularyitems" type="authority" version="0.1">
+        <tenant:serviceBindings id="Vocabularyitems" name="Vocabularyitems" type="vocabulary" version="0.1">
             <!-- other URI paths through which this service could be accessed -->
             <!--
             <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'>
diff --git a/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java b/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java
index 1d739f4eb..6cad17a79 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java
@@ -409,9 +409,10 @@ public class TenantBindingConfigReaderImpl
     	return getServiceBindingsByType(tenantId, serviceTypes);
     }
     /**
-     * getServiceBinding gets service binding for given tenant for a given service
+     * getServiceBindingsByType gets service bindings for a given tenant
+     * for the services that fall within a supplied set of service type(s)
      * @param tenantId
-     * @param serviceName
+     * @param serviceTypes
      * @return
      */
     public List<ServiceBindingType> getServiceBindingsByType(