CSPACE-5678:Fixed issues related to vocab item list 'field returns' line in the payloads.

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/res/GetVocabularyItems.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/res/GetVocabularyItems.res.xml
index a58108188ba5a490b2a4dd8ed2ae2da562edaeba..976e978a088f045709f5841f3fa7c33ed7900556 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/res/GetVocabularyItems.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/res/GetVocabularyItems.res.xml
@@ -6,7 +6,7 @@
        <pageNum>0</pageNum>
     <itemsInPage>3</itemsInPage>
     <totalItems>3</totalItems>
-    <fieldsReturned>csid|uri|refName|updatedAt|workflowState|order|displayName|shortIdentifier|termStatus</fieldsReturned>
+    <fieldsReturned>csid|uri|refName|updatedAt|workflowState|order|termStatus|displayName|shortIdentifier</fieldsReturned>
     <list-item>
         <displayName>${Item1.displayName}</displayName>
         <shortIdentifier>${Item1.itemID}</shortIdentifier>

diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index 228e3401d90d4e5fb724bcf281909b2fc8110b5d..5b3060c48568210045bca8adc124889f199a029d 100644 (file)
--- a/services/JaxRsServiceProvider/build.xml
+++ b/services/JaxRsServiceProvider/build.xml
@@ -140,7 +140,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="deploy_services_bundles"
+    <target name="deploy" depends="package,deploy_services_bundles"
     description="deploy cspace services in ${jee.server.cspace}">
                <delete file="${catalina.context.cspace}"/> <!-- This is a Tomcat specific file that we seem to need to delete inorder for it to be replace with a more recent one during deployment -->
                <delete dir="${jee.deploy.cspace}/${cspace.services.context}"/>
@@ -158,7 +158,7 @@
                This target also assumes that the system environment variable 'CSPACE_JEESERVER_HOME' is set and pointing to the root
                JEE server (usually Apache Tomcat) where CollectionSpace is installed.  All generated Service artifacts wi
        -->
-       <target name="deploy_services_bundles" depends="package"
+       <target name="deploy_services_bundles"
                description="Generates and deploys the CollectionSpace Services' schema bundles, doctype bundles, and tenant bindings.">
                <exec executable="${env.JAVA_HOME}/bin/java" failonerror="true">
                        <arg value="-Done-jar.silent=true" />

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 689073c6dd8eb69e1ca5d0f8da9b407c98480fe0..3791693db0cd22df35daf33ad5ecac2251f79e9b 100644 (file)
--- 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
@@ -29,6 +29,7 @@
                        </types:item>
                </tenant:properties>
 
+               <!--
                <tenant:serviceBindings id="Vocabularyitems" merge:matcher="id">
                        <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                                <service:params>
@@ -41,6 +42,7 @@
                                </service:params>
                        </service:DocHandlerParams>
                </tenant:serviceBindings>
+               -->
 
                <!-- begin idgenerator service meta-data -->
                <tenant:serviceBindings id="idgenerators" merge:matcher="id" name="idgenerators" type="utility"