CSPACE-5733: Moved vocabularyitems service to a new 'vocabulary' service type, thus...

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 2d59ce237eb7921b9c83669004bd7678764daa9c..c295417f8e15a91e98bfd6326ca92535d4a37f58 100644 (file)
--- 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 1d739f4eb14a8c55866bd601faf55499ecf5b082..6cad17a791f494676dcbf72226806ee454ebbfcf 100644 (file)
--- 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(