From 4d75abe0dc653f1afe6cf74eda08fcf69804811f Mon Sep 17 00:00:00 2001
From: Richard Millet <remillet@berkeley.edu>
Date: Tue, 6 Aug 2013 12:35:15 -0700
Subject: [PATCH] CSPACE-5678:Fixed issues related to vocab item list 'field
 returns' line in the payloads.

---
 .../xmlreplay/vocabulary/res/GetVocabularyItems.res.xml       | 2 +-
 services/JaxRsServiceProvider/build.xml                       | 4 ++--
 .../config/services/tenants/tenant-bindings-proto-unified.xml | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

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 a58108188..976e978a0 100644
--- 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 228e3401d..5b3060c48 100644
--- 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 689073c6d..3791693db 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
@@ -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"
-- 
2.47.3