From: remillet <remillet@yahoo.com>
Date: Mon, 12 Dec 2016 01:28:34 +0000 (-0800)
Subject: CSPACE-7052: Fixed an issue with immutable URI in ServiceGroup resource getItems... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f72ef100f5f21d74cd46eed4e328c3a598180c2b;p=tmp%2Fjakarta-migration.git

CSPACE-7052: Fixed an issue with immutable URI in ServiceGroup resource getItems request.  Added patched jar for Nuxeo bug dealing with simple lists that have an empty first element.
---

diff --git a/3rdparty/nuxeo/nuxeo-server/7.10-HF17/bundles/nuxeo-core-storage-7.10-HF09.jar b/3rdparty/nuxeo/nuxeo-server/7.10-HF17/bundles/nuxeo-core-storage-7.10-HF17.jar
similarity index 72%
rename from 3rdparty/nuxeo/nuxeo-server/7.10-HF17/bundles/nuxeo-core-storage-7.10-HF09.jar
rename to 3rdparty/nuxeo/nuxeo-server/7.10-HF17/bundles/nuxeo-core-storage-7.10-HF17.jar
index 3d261840b..9b33cb60b 100644
Binary files a/3rdparty/nuxeo/nuxeo-server/7.10-HF17/bundles/nuxeo-core-storage-7.10-HF09.jar and b/3rdparty/nuxeo/nuxeo-server/7.10-HF17/bundles/nuxeo-core-storage-7.10-HF17.jar differ
diff --git a/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/ServiceGroupResource.java b/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/ServiceGroupResource.java
index 630355742..5bc7924c0 100644
--- a/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/ServiceGroupResource.java
+++ b/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/ServiceGroupResource.java
@@ -38,6 +38,7 @@ import org.collectionspace.services.common.CSWebApplicationException;
 import org.collectionspace.services.common.NuxeoBasedResource;
 import org.collectionspace.services.common.ServiceMain;
 import org.collectionspace.services.common.ServiceMessages;
+import org.collectionspace.services.common.UriInfoWrapper;
 import org.collectionspace.services.common.api.Tools;
 import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl;
 import org.collectionspace.services.common.context.MultipartServiceContextFactory;
@@ -50,7 +51,6 @@ import org.collectionspace.services.config.service.ServiceBindingType;
 import org.collectionspace.services.config.service.ServiceObjectType;
 import org.collectionspace.services.nuxeo.client.java.CommonList;
 import org.collectionspace.services.servicegroup.nuxeo.ServiceGroupDocumentModelHandler;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -111,8 +111,6 @@ public class ServiceGroupResource extends AbstractCollectionSpaceResourceImpl<Po
         try {
             CommonList commonList = new CommonList();
             AbstractCommonList list = (AbstractCommonList)commonList;
-	        ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();
-	    	String commonSchema = ctx.getCommonPartLabel();
 	    	ArrayList<String> svcGroups = new ArrayList<String>();
 	    	svcGroups.add("procedure");
 	    	svcGroups.add("object");
@@ -206,8 +204,9 @@ public class ServiceGroupResource extends AbstractCollectionSpaceResourceImpl<Po
     @GET
     @Path("{csid}/items")
     public AbstractCommonList getItems(
-            @Context UriInfo ui,
+            @Context UriInfo uriInfo,
             @PathParam("csid") String serviceGroupName) {
+    	UriInfoWrapper ui = new UriInfoWrapper(uriInfo);
         ensureCSID(serviceGroupName, NuxeoBasedResource.READ);
         AbstractCommonList list = null;
         try {