X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=legacy%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fmodel%2FRepoElem.java;h=9356f0828db95cad6a3295082c464556cafd1f73;hb=fbde11e8a342318876a4744c4676d3618bdf8583;hp=8ae8e8b8cf77dc5991e3fe3245f1509f9d430974;hpb=6fc94d69efe089414ac9e63bde3efab1cbf7b7ca;p=gpl%2Fargeo-slc.git

diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java
index 8ae8e8b8c..9356f0828 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java
@@ -9,10 +9,10 @@ import javax.jcr.RepositoryException;
 import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 
-import org.argeo.api.NodeConstants;
-import org.argeo.api.NodeUtils;
-import org.argeo.api.security.Keyring;
+import org.argeo.api.cms.CmsConstants;
 import org.argeo.cms.ArgeoNames;
+import org.argeo.cms.jcr.CmsJcrUtils;
+import org.argeo.cms.security.Keyring;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.repo.RepoConstants;
@@ -23,7 +23,7 @@ import org.argeo.slc.repo.RepoUtils;
  * home Node or just an URI and a label if user is anonymous
  */
 public class RepoElem extends DistParentElem {
-	// private final static Log log = LogFactory.getLog(RepoElem.class);
+	// private final static CmsLog log = CmsLog.getLog(RepoElem.class);
 
 	private RepositoryFactory repositoryFactory;
 	private Keyring keyring;
@@ -85,7 +85,7 @@ public class RepoElem extends DistParentElem {
 		if (repository == null)
 			if (repoNode == null)
 				// Anonymous
-				repository = NodeUtils.getRepositoryByUri(repositoryFactory, uri);
+				repository = CmsJcrUtils.getRepositoryByUri(repositoryFactory, uri);
 			else {
 				repository = RepoUtils.getRepository(repositoryFactory, keyring, repoNode);
 				credentials = RepoUtils.getRepositoryCredentials(keyring, repoNode);
@@ -93,7 +93,7 @@ public class RepoElem extends DistParentElem {
 
 		try {
 			// FIXME make it more generic
-			String defaultWorkspace = NodeConstants.SYS_WORKSPACE;
+			String defaultWorkspace = CmsConstants.SYS_WORKSPACE;
 			defaultSession = repository.login(credentials, defaultWorkspace);
 			refreshChildren();
 		} catch (RepositoryException e) {
@@ -174,7 +174,7 @@ public class RepoElem extends DistParentElem {
 	protected Session repositoryLogin(String workspaceName) {
 		try {
 			if (workspaceName == null)
-				workspaceName = NodeConstants.SYS_WORKSPACE;// FIXME make it more generic
+				workspaceName = CmsConstants.SYS_WORKSPACE;// FIXME make it more generic
 			return repository.login(credentials, workspaceName);
 		} catch (RepositoryException e) {
 			throw new SlcException("Cannot login repository " + label + " with credential " + credentials, e);