From: Richard Millet <remillet@berkeley.edu>
Date: Mon, 24 Feb 2014 18:27:42 +0000 (-0800)
Subject: Merge branch 'PAHMA-963-REM-A' into PAHMA-963-REM-C
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=5f7320b764b09d045d55bf8d0d174d339d0fc61b;p=tmp%2Fjakarta-migration.git

Merge branch 'PAHMA-963-REM-A' into PAHMA-963-REM-C
---

5f7320b764b09d045d55bf8d0d174d339d0fc61b
diff --cc services/common/pom.xml
index 6a6e6e6b8,38b714cb5..9676e2f37
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@@ -378,8 -384,38 +384,13 @@@
              <version>${spring.security.version}</version>
              <scope>provided</scope>
          </dependency>
+ 		<dependency>
+ 			<groupId>org.springframework</groupId>
+ 			<artifactId>spring-aop</artifactId>
+ 			<version>${spring.version}</version>
+ 		</dependency>        
      </dependencies>
  
 -    <repositories>
 -        <repository>
 -            <snapshots>
 -                <enabled>false</enabled>
 -            </snapshots>
 -            <releases>
 -                <enabled>true</enabled>
 -            </releases>
 -            <id>el4jReleaseRepositoryExternal</id>
 -            <name>External release repository of the EL4J project</name>
 -            <url>http://public-el4.elca-services.ch/el4j/maven2repository</url>
 -        </repository>
 -        <repository>
 -            <snapshots>
 -                <enabled>false</enabled>
 -            </snapshots>
 -            <releases>
 -                <enabled>true</enabled>
 -            </releases>
 -            <id>Apache</id>
 -            <name>External release repository of the Apache projects</name>
 -            <url>https://repository.apache.org/content/groups/public/</url>
 -        </repository>
 -    </repositories>
 -
      <build>
          <finalName>collectionspace-services-common</finalName>
      	<defaultGoal>install</defaultGoal>
diff --cc services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
index ec2d63d84,13f47fe5d..7699f7520
--- 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
@@@ -472,28 -465,10 +472,28 @@@ public class RefNameServiceUtils 
          return nRefsFound;
      }
  
 -    private static DocumentModelList findAuthorityRefDocs(
 +    private static DocumentModelList findAllAuthorityRefDocs(
 +            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,
 +            RepositoryClient<PoxPayloadIn, PoxPayloadOut> repoClient,
 +            RepositoryInstance repoSession, List<String> serviceTypes,
 +            String refName,
 +            String refPropName,
 +            Map<String, ServiceBindingType> queriedServiceBindings,
 +            Map<String, List<AuthRefConfigInfo>> authRefFieldsByService,
 +            String whereClauseAdditions,
 +            String orderByClause,
 +            int pageSize,
 +            boolean computeTotal) throws DocumentException, DocumentNotFoundException {
 +    	    	
 +    	return new LazyAuthorityRefDocList(ctx, repoClient, repoSession,
 +    			serviceTypes, refName, refPropName, queriedServiceBindings, authRefFieldsByService,
 +    			whereClauseAdditions, orderByClause, pageSize, computeTotal);
 +    }
 +    
 +    protected static DocumentModelList findAuthorityRefDocs(
              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,