From 9caacf3c5b2b073cc18baa46d205789fc7f5bd06 Mon Sep 17 00:00:00 2001
From: Richard Millet <remillet@berkeley.edu>
Date: Mon, 24 Feb 2014 11:02:09 -0800
Subject: [PATCH] PAHMA-963: Updated merged code from master branch to use new
 RepositoryInstanceInterface.

---
 .../services/common/vocabulary/LazyAuthorityRefDocList.java | 6 ++++--
 .../services/common/vocabulary/RefNameServiceUtils.java     | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/LazyAuthorityRefDocList.java b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/LazyAuthorityRefDocList.java
index e1810a3e4..a1570e536 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/LazyAuthorityRefDocList.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/LazyAuthorityRefDocList.java
@@ -12,6 +12,8 @@ import org.collectionspace.services.common.document.DocumentNotFoundException;
 import org.collectionspace.services.common.repository.RepositoryClient;
 import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.AuthRefConfigInfo;
 import org.collectionspace.services.config.service.ServiceBindingType;
+import org.collectionspace.services.nuxeo.client.java.RepositoryInstanceInterface;
+
 import org.nuxeo.ecm.core.api.DocumentModel;
 import org.nuxeo.ecm.core.api.DocumentModelList;
 import org.nuxeo.ecm.core.api.impl.DocumentModelListImpl;
@@ -35,7 +37,7 @@ public class LazyAuthorityRefDocList extends DocumentModelListImpl {
 	
 	private ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx;
 	private RepositoryClient<PoxPayloadIn, PoxPayloadOut> repoClient;
-	private RepositoryInstance repoSession;
+	private RepositoryInstanceInterface repoSession;
 	private List<String> serviceTypes;
 	private String refName;
 	private String refPropName;
@@ -69,7 +71,7 @@ public class LazyAuthorityRefDocList extends DocumentModelListImpl {
 	public LazyAuthorityRefDocList(
 	        ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,
 	        RepositoryClient<PoxPayloadIn, PoxPayloadOut> repoClient,
-	        RepositoryInstance repoSession, List<String> serviceTypes,
+	        RepositoryInstanceInterface repoSession, List<String> serviceTypes,
 	        String refName,
 	        String refPropName,
 	        Map<String, ServiceBindingType> queriedServiceBindings,
diff --git a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
index 7699f7520..254a63f59 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
@@ -36,8 +36,10 @@ import org.nuxeo.ecm.core.api.model.PropertyException;
 import org.nuxeo.ecm.core.api.model.PropertyNotFoundException;
 import org.nuxeo.ecm.core.api.model.impl.primitives.StringProperty;
 import org.nuxeo.ecm.core.api.repository.RepositoryInstance;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.collectionspace.services.client.CollectionSpaceClient;
 import org.collectionspace.services.client.IRelationsManager;
 import org.collectionspace.services.client.PoxPayloadIn;
@@ -475,7 +477,7 @@ public class RefNameServiceUtils {
     private static DocumentModelList findAllAuthorityRefDocs(
             ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,
             RepositoryClient<PoxPayloadIn, PoxPayloadOut> repoClient,
-            RepositoryInstance repoSession, List<String> serviceTypes,
+            RepositoryInstanceInterface repoSession, List<String> serviceTypes,
             String refName,
             String refPropName,
             Map<String, ServiceBindingType> queriedServiceBindings,
-- 
2.47.3