From: Richard Millet <remillet@berkeley.edu>
Date: Fri, 14 Dec 2012 21:09:14 +0000 (-0800)
Subject: Merge branch 'CSPACE-5678' into CSPACE-5678-A
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=25cb44ab091d9556f34db2802c26eec7395f1bdd;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5678' into CSPACE-5678-A
---

25cb44ab091d9556f34db2802c26eec7395f1bdd
diff --cc services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java
index 694ab3f93,4d3e266db..f8f462342
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java
@@@ -6,14 -5,11 +6,15 @@@ import java.util.Collection
  import java.util.Hashtable;
  import java.util.Iterator;
  
 +import javax.naming.InitialContext;
 +import javax.naming.NamingException;
  import javax.servlet.ServletContext;
  
+ import org.collectionspace.services.common.api.JEEServerDeployment;
  import org.collectionspace.services.config.RepositoryClientConfigType;
 +import org.collectionspace.services.config.tenant.RepositoryDomainType;
  import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 +import org.nuxeo.ecm.core.NXCore;
  import org.nuxeo.ecm.core.api.DocumentModel;
  import org.nuxeo.ecm.core.api.DocumentModelList;
  import org.nuxeo.ecm.core.api.repository.RepositoryInstance;