From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Sat, 12 Jan 2013 01:34:46 +0000 (-0800)
Subject: CSPACE-5728: Revert change to AbstractMultiPartCollectionSpaceResourceImpl.java;... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=cf8a879edff130a52f1519fab3abcb6c6ac6b877;p=tmp%2Fjakarta-migration.git

CSPACE-5728: Revert change to AbstractMultiPartCollectionSpaceResourceImpl.java; despite NetBeans IDE warning about not finding method signature in this case (perhaps due to JAX-RS annotations?) in ResourceBase, current call compiles and runs fine. Comment out 'no context' test group in XmlReplay-based tests of the batch job; see warning comment on top of that test group for the limited circumstances in which that test group should be run.
---

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
index 8bc0bce3e..414838438 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
@@ -605,6 +605,7 @@
         only at your peril.  Use ONLY during development. - ADR 2013-01-10
     -->
     
+    <!--
     <testGroup ID="invocationModeNoContext" autoDeletePOSTS="true">
         
         <test ID="createBatchRecord">
@@ -725,6 +726,7 @@
         </test>
         
     </testGroup>
+    -->
     
 </xmlReplay>
 
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 75bf77a57..726b1420d 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
@@ -176,15 +176,6 @@ public abstract class AbstractMultiPartCollectionSpaceResourceImpl extends Abstr
     public byte[] getWorkflow(
     		@Context UriInfo uriInfo,
             @PathParam("csid") String csid) {
-        return getWorkflow(uriInfo, csid, null);
-        
-    }
-    
-    // Added to expose this functionality to batch jobs via the ResourceMap
-    // of ResourceBase classes.
-    //
-    // Argument 'params' is unused, and exists only to avoid duplicating method signatures.
-    public byte[] getWorkflow(UriInfo uriInfo, String csid, String params) {
         PoxPayloadOut result = null;
 
         try {