From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 22 Jun 2012 18:25:58 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into cspace-5271
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=b772efef552952bd0aea8828069d48301c6bc188;p=tmp%2Fjakarta-migration.git

Merge remote-tracking branch 'upstream/master' into cspace-5271

Conflicts:
	services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
---

b772efef552952bd0aea8828069d48301c6bc188
diff --cc services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
index 7d19d76d5,fcee903af..5ee13d4fe
--- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
+++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
@@@ -80,16 -80,7 +80,14 @@@ import javax.ws.rs.core.Response
  import javax.ws.rs.core.UriBuilder;
  import javax.ws.rs.core.UriInfo;
  
- import java.util.ArrayList;
 +import java.util.HashMap;
  import java.util.List;
 +import java.util.Map;
- import org.collectionspace.services.client.*;
 +import org.collectionspace.services.common.*;
 +
 +import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl;
 +import org.collectionspace.services.config.service.ServiceBindingType;
 +
  import org.collectionspace.services.nuxeo.util.NuxeoUtils;
  
  /**