CSPACE-7052: Fixed an issue with immutable URI in ServiceGroup resource getItems...

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 3d261840b19474c92ece53bf4201aedea75eb544..9b33cb60be3672dc08c32245098fbc9375c7b4e9 100644 (file)
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 6303557421254c08e00dc41ebecab45b7a9c5704..5bc7924c0cfe859756cd440b5917093527334df2 100644 (file)
--- 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 {