From: remillet <remillet@yahoo.com>
Date: Mon, 27 Feb 2017 22:56:04 +0000 (-0800)
Subject: CSPACE-7060: Add core values part to return payload of PUT/update requests.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=0b38208c0b7467f0f3484263ef7e9b9bd5a55b66;p=tmp%2Fjakarta-migration.git

CSPACE-7060: Add core values part to return payload of PUT/update requests.
---

diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index 5203ffc16..dcad21410 100644
--- a/services/JaxRsServiceProvider/build.xml
+++ b/services/JaxRsServiceProvider/build.xml
@@ -140,7 +140,11 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package,deploy_services_artifacts"
+    <target name="deploy" depends="quick-deploy,deploy_services_artifacts"
+    description="deploy cspace services in ${jee.server.cspace}">
+    </target>
+
+    <target name="quick-deploy" depends="package"
     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}"/>
diff --git a/services/common/src/main/java/org/collectionspace/services/common/AbstractMultiPartCollectionSpaceResourceImpl.java b/services/common/src/main/java/org/collectionspace/services/common/AbstractMultiPartCollectionSpaceResourceImpl.java
index 5b69b0501..7d5d1810a 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/AbstractMultiPartCollectionSpaceResourceImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/AbstractMultiPartCollectionSpaceResourceImpl.java
@@ -289,10 +289,10 @@ public abstract class AbstractMultiPartCollectionSpaceResourceImpl extends Abstr
     		@Context UriInfo uriInfo,
     		@PathParam("csid") String csid,
     		@PathParam("transition") String transition) {
-        PoxPayloadOut result = null;
+    	PoxPayloadOut result = null;
                 
         try {
-        	result = this.updateWorkflowWithTransition(NULL_CONTEXT, uriInfo, csid, transition);
+        	result = updateWorkflowWithTransition(NULL_CONTEXT, uriInfo, csid, transition);
         } catch (Exception e) {
             throw bigReThrow(e, ServiceMessages.UPDATE_FAILED + WorkflowClient.SERVICE_PAYLOAD_NAME, csid);
         }
diff --git a/services/common/src/main/java/org/collectionspace/services/common/workflow/service/nuxeo/WorkflowDocumentModelHandler.java b/services/common/src/main/java/org/collectionspace/services/common/workflow/service/nuxeo/WorkflowDocumentModelHandler.java
index 10e3ab8e1..0842347f8 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/workflow/service/nuxeo/WorkflowDocumentModelHandler.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/workflow/service/nuxeo/WorkflowDocumentModelHandler.java
@@ -176,5 +176,17 @@ public class WorkflowDocumentModelHandler
     		throw ce;
     	}
     }
+    
+    /*
+     * Add the workflow common part(s) to the output result
+     * (non-Javadoc)
+     * @see org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl#completeUpdate(org.collectionspace.services.common.document.DocumentWrapper)
+     */
+    @Override
+    public void completeUpdate(DocumentWrapper<DocumentModel> wrapDoc) throws Exception {
+    	extractAllParts(wrapDoc);
+    	super.completeUpdate(wrapDoc);
+    }
+
 }