Adapt to changes in Argeo Commons

diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddRemoteRepository.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddRemoteRepository.java
index d309a7778a3203005e7a85b1e78d44dfae19379c..8ae330c6c33eb7ff89485bb310c107db05e22ef0 100644 (file)
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddRemoteRepository.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddRemoteRepository.java
@@ -10,10 +10,10 @@ import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
 
 import org.argeo.api.NodeConstants;
-import org.argeo.api.NodeUtils;
 import org.argeo.api.security.Keyring;
 import org.argeo.cms.ArgeoNames;
 import org.argeo.cms.ArgeoTypes;
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.cms.ui.workbench.internal.WorkbenchConstants;
 import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.eclipse.ui.EclipseUiException;
@@ -149,7 +149,7 @@ public class AddRemoteRepository extends AbstractHandler implements WorkbenchCon
                        Session nodeSession = null;
                        try {
                                nodeSession = nodeRepository.login();
-                               Node home = NodeUtils.getUserHome(nodeSession);
+                               Node home = CmsJcrUtils.getUserHome(nodeSession);
 
                                Node remote = home.hasNode(ARGEO_REMOTE) ? home.getNode(ARGEO_REMOTE) : home.addNode(ARGEO_REMOTE);
                                if (remote.hasNode(name.getText()))

diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java
index 9318555a57cee7b66da124659d3e2b5016f5fc9e..66aea95e401d132031cfa26fcc65bcd48fb5a68a 100644 (file)
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java
@@ -17,10 +17,10 @@ import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 
 import org.argeo.api.NodeInstance;
-import org.argeo.api.NodeUtils;
 import org.argeo.cms.ArgeoNames;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.UserAdminUtils;
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.cms.ui.workbench.CmsWorkbenchStyles;
 import org.argeo.cms.ui.workbench.internal.useradmin.SecurityAdminImages;
@@ -175,7 +175,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
                                // dnTxt.setText(group.getName());
                                // cnTxt.setText(UserAdminUtils.getProperty(group, LdapAttrs.cn.name()));
                                descTxt.setText(UserAdminUtils.getProperty(group, LdapAttrs.description.name()));
-                               Node workgroupHome = NodeUtils.getGroupHome(session, cn);
+                               Node workgroupHome = CmsJcrUtils.getGroupHome(session, cn);
                                if (workgroupHome == null)
                                        markAsWorkgroupLk.setText("<a>Mark as workgroup</a>");
                                else
@@ -194,7 +194,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
                                boolean confirmed = MessageDialog.openConfirm(parent.getShell(), "Mark as workgroup",
                                                "Are you sure you want to mark " + cn + " as being a workgroup? ");
                                if (confirmed) {
-                                       Node workgroupHome = NodeUtils.getGroupHome(session, cn);
+                                       Node workgroupHome = CmsJcrUtils.getGroupHome(session, cn);
                                        if (workgroupHome != null)
                                                return; // already marked as workgroup, do nothing
                                        else

diff --git a/legacy/org.argeo.slc.client.ui.dist/bnd.bnd b/legacy/org.argeo.slc.client.ui.dist/bnd.bnd
index c2eeb8769df955fa0b48d82d6dd0c5d5c1c98c59..b075699aa0c15f3079a438a2988b50cb07aac204 100644 (file)
--- a/legacy/org.argeo.slc.client.ui.dist/bnd.bnd
+++ b/legacy/org.argeo.slc.client.ui.dist/bnd.bnd
@@ -11,5 +11,6 @@ javax.jcr.nodetype,\
 javax.jcr.security,\
 aQute.lib.*;resolution:=optional,\
 org.osgi.*;version=0.0.0,\
+org.argeo.api,\
 *
                                                        
\ No newline at end of file

diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
index b7e25d1ee47295433c29f481fdf36eb173307bfa..c2e9a8e4879994819dcce2071be346d8ac6896e1 100644 (file)
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
@@ -13,10 +13,10 @@ import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 
 import org.argeo.api.NodeConstants;
-import org.argeo.api.NodeUtils;
 import org.argeo.api.security.Keyring;
 import org.argeo.cms.ArgeoNames;
 import org.argeo.cms.ArgeoTypes;
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
@@ -47,7 +47,7 @@ public class DistTreeContentProvider implements ITreeContentProvider {
                                dispose();
                        nodeSession = nodeRepository.login(NodeConstants.HOME_WORKSPACE);
 
-                       String reposPath = NodeUtils.getUserHome(nodeSession).getPath() + RepoConstants.REPOSITORIES_BASE_PATH;
+                       String reposPath = CmsJcrUtils.getUserHome(nodeSession).getPath() + RepoConstants.REPOSITORIES_BASE_PATH;
 
                        if (!nodeSession.itemExists(reposPath))
                                initializeModel(nodeSession);
@@ -103,7 +103,7 @@ public class DistTreeContentProvider implements ITreeContentProvider {
 
        private void initializeModel(Session nodeSession) {
                try {
-                       Node homeNode = NodeUtils.getUserHome(nodeSession);
+                       Node homeNode = CmsJcrUtils.getUserHome(nodeSession);
                        if (homeNode == null) // anonymous
                                throw new SlcException("User must be authenticated.");
 
@@ -114,7 +114,7 @@ public class DistTreeContentProvider implements ITreeContentProvider {
 
                        // register default local java repository
                        String alias = RepoConstants.DEFAULT_JAVA_REPOSITORY_ALIAS;
-                       Repository javaRepository = NodeUtils.getRepositoryByAlias(repositoryFactory, alias);
+                       Repository javaRepository = CmsJcrUtils.getRepositoryByAlias(repositoryFactory, alias);
                        if (javaRepository != null) {
                                if (!repos.hasNode(alias)) {
                                        Node repoNode = repos.addNode(alias, ArgeoTypes.ARGEO_REMOTE_REPOSITORY);

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 8ae8e8b8cf77dc5991e3fe3245f1509f9d430974..7d4ef1f4bf61075cfef6429b2b40cb2275c5df2c 100644 (file)
--- 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
@@ -10,9 +10,9 @@ 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.cms.ArgeoNames;
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.repo.RepoConstants;
@@ -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);

diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
index 272acbc2896b04c1740c3eda70f62b4c5ab6c381..dfbca8d39a4bb9f067d9d56ad587671dc5b83599 100644 (file)
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
@@ -13,10 +13,10 @@ import javax.jcr.RepositoryException;
 import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 
-import org.argeo.api.NodeUtils;
 import org.argeo.api.security.Keyring;
 import org.argeo.cms.ArgeoNames;
 import org.argeo.cms.ArgeoTypes;
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.cms.ui.workbench.util.PrivilegedJob;
 import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor;
 import org.argeo.jcr.JcrMonitor;
@@ -628,7 +628,7 @@ public class FetchWizard extends Wizard {
        // populate available source repo list
        private Map<String, Node> getSourceRepoUris() {
                try {
-                       Node repoList = currSession.getNode(NodeUtils.getUserHome(
+                       Node repoList = currSession.getNode(CmsJcrUtils.getUserHome(
                                        currSession).getPath()
                                        + RepoConstants.REPOSITORIES_BASE_PATH);
 

diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java
index 75a801574bdeb9ecd1e57c0ddbadeff669cafb92..31e726a03525f1d8b422752e5b5b430221049df3 100644 (file)
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java
@@ -12,10 +12,10 @@ import javax.jcr.SimpleCredentials;
 import javax.jcr.nodetype.NodeType;
 
 import org.argeo.api.NodeConstants;
-import org.argeo.api.NodeUtils;
 import org.argeo.api.security.Keyring;
 import org.argeo.cms.ArgeoNames;
 import org.argeo.cms.ArgeoTypes;
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
@@ -89,7 +89,7 @@ public class RegisterRepoWizard extends Wizard {
                Session nodeSession = null;
                try {
                        nodeSession = nodeRepository.login(NodeConstants.HOME_WORKSPACE);
-                       String reposPath = NodeUtils.getUserHome(nodeSession).getPath() + RepoConstants.REPOSITORIES_BASE_PATH;
+                       String reposPath = CmsJcrUtils.getUserHome(nodeSession).getPath() + RepoConstants.REPOSITORIES_BASE_PATH;
 
                        Node repos = nodeSession.getNode(reposPath);
                        String repoNodeName = JcrUtils.replaceInvalidChars(name.getText());
@@ -239,7 +239,7 @@ public class RegisterRepoWizard extends Wizard {
                        if (uri.getText().startsWith("http")) {// http, https
                                URI checkedUri = new URI(uri.getText());
                                String checkedUriStr = checkedUri.toString();
-                               Repository repository = NodeUtils.getRepositoryByUri(repositoryFactory, checkedUriStr);
+                               Repository repository = CmsJcrUtils.getRepositoryByUri(repositoryFactory, checkedUriStr);
                                if (username.getText().trim().equals("")) {// anonymous
                                        session = repository.login(RepoConstants.DEFAULT_DEFAULT_WORKSPACE);
                                } else {
@@ -248,7 +248,7 @@ public class RegisterRepoWizard extends Wizard {
                                        session = repository.login(sc, RepoConstants.DEFAULT_DEFAULT_WORKSPACE);
                                }
                        } else {// alias
-                               Repository repository = NodeUtils.getRepositoryByAlias(repositoryFactory, uri.getText());
+                               Repository repository = CmsJcrUtils.getRepositoryByAlias(repositoryFactory, uri.getText());
                                session = repository.login();
                        }
                        MessageDialog.openInformation(getShell(), "Success", "Connection to '" + uri.getText() + "' successful");

diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java
index 977bf8786d1362f3ae12be33558e80cf1167d2b2..f62700a0e4c7c85ea9a671e600ea580006eee8c2 100644 (file)
--- a/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java
+++ b/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java
@@ -22,8 +22,8 @@ import org.apache.commons.vfs2.FileSelectInfo;
 import org.apache.commons.vfs2.FileSelector;
 import org.apache.commons.vfs2.FileSystemException;
 import org.apache.commons.vfs2.FileSystemManager;
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.api.NodeUtils;
 import org.argeo.slc.SlcException;
 
 /** Backups a JCR repository */
@@ -54,7 +54,7 @@ public class JcrRepositoryBackup implements Runnable {
                        if (hasDatastore())
                                backupDataStore(archiveRoot.resolveFile(datastoreFolderName));
 
-                       Repository sourceRepository = NodeUtils.getRepositoryByUri(
+                       Repository sourceRepository = CmsJcrUtils.getRepositoryByUri(
                                        repositoryFactory, sourceRepo);
                        Credentials sourceCredentials = null;
                        if (sourceUsername != null)

diff --git a/org.argeo.slc.jcr/bnd.bnd b/org.argeo.slc.jcr/bnd.bnd
index 28c2b844a27bd0368d43c3892823dd482ca72ab2..151d880ce386d97f379a6970addd760990e88259 100644 (file)
--- a/org.argeo.slc.jcr/bnd.bnd
+++ b/org.argeo.slc.jcr/bnd.bnd
@@ -1,3 +1,4 @@
 Import-Package: javax.jcr.nodetype,\
 javax.jcr.security,\
+org.argeo.api,\
 *
\ No newline at end of file

diff --git a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java
index c7717dbc3463f7554bb0006546452212b18dc9d4..89f416819d4a13d154e224b92e74d21db248095f 100644 (file)
--- a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java
+++ b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java
@@ -5,7 +5,7 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 
-import org.argeo.api.NodeUtils;
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.SlcNames;
@@ -22,7 +22,7 @@ public class SlcJcrResultUtils {
         */
        public static String getSlcResultsBasePath(Session session) {
                try {
-                       Node userHome = NodeUtils.getUserHome(session);
+                       Node userHome = CmsJcrUtils.getUserHome(session);
                        if (userHome == null)
                                throw new SlcException("No user home available for "
                                                + session.getUserID());
@@ -72,7 +72,7 @@ public class SlcJcrResultUtils {
         */
        public static String getMyResultsBasePath(Session session) {
                try {
-                       Node userHome = NodeUtils.getUserHome(session);
+                       Node userHome = CmsJcrUtils.getUserHome(session);
                        if (userHome == null)
                                throw new SlcException("No user home available for "
                                                + session.getUserID());

diff --git a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrUtils.java b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrUtils.java
index c91a94c1b22f67d253e9e0d6ee1b3151e7187ade..9834bef06fa17f7dae03e48f5f103aea6f8d5931 100644 (file)
--- a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrUtils.java
+++ b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrUtils.java
@@ -11,7 +11,7 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 
-import org.argeo.api.NodeUtils;
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.DefaultNameVersion;
 import org.argeo.slc.NameVersion;
@@ -94,7 +94,7 @@ public class SlcJcrUtils implements SlcNames {
        /** Get the base for the user processi. */
        public static String getSlcProcessesBasePath(Session session) {
                try {
-                       Node userHome = NodeUtils.getUserHome(session);
+                       Node userHome = CmsJcrUtils.getUserHome(session);
                        if (userHome == null)
                                throw new SlcException("No user home available for "
                                                + session.getUserID());

diff --git a/org.argeo.slc.repo/bnd.bnd b/org.argeo.slc.repo/bnd.bnd
index 7e59f4e33c4d9bca0b41133eb065a6e7270f2d86..6e38b44dc37ab463c8700adadca6048095d57cbe 100644 (file)
--- a/org.argeo.slc.repo/bnd.bnd
+++ b/org.argeo.slc.repo/bnd.bnd
@@ -4,11 +4,9 @@ javax.xml.transform.*,\
 javax.xml.parsers.*,\
 javax.jcr.nodetype,\
 org.osgi.*;version=0.0.0,\
+org.argeo.api,\
 *
 
-Private-Package: org.eclipse.aether.*
-Export-Package: !org.eclipse.aether.*, !*.internal.*, *
-
 Require-Capability: cms.datamodel; filter:="(name=slc)"
 Provide-Capability: cms.datamodel; name=java,\
  cms.datamodel; name=dist,\

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java
index 2eb532e7652f6bad58afa4ff8fa9a488b0d6b31f..8041cf0f3a8cba08245baee26a1fcd4a68a14742 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java
@@ -29,9 +29,9 @@ import javax.jcr.query.QueryResult;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.api.NodeUtils;
 import org.argeo.slc.SlcException;
 import org.xml.sax.SAXException;
 
@@ -104,14 +104,14 @@ public class RepoSync implements Runnable {
 
                        // Setup
                        if (sourceRepository == null)
-                               sourceRepository = NodeUtils.getRepositoryByUri(repositoryFactory, sourceRepoUri);
+                               sourceRepository = CmsJcrUtils.getRepositoryByUri(repositoryFactory, sourceRepoUri);
                        if (sourceCredentials == null && sourceUsername != null)
                                sourceCredentials = new SimpleCredentials(sourceUsername, sourcePassword);
                        // FIXME make it more generic
                        sourceDefaultSession = sourceRepository.login(sourceCredentials, RepoConstants.DEFAULT_DEFAULT_WORKSPACE);
 
                        if (targetRepository == null)
-                               targetRepository = NodeUtils.getRepositoryByUri(repositoryFactory, targetRepoUri);
+                               targetRepository = CmsJcrUtils.getRepositoryByUri(repositoryFactory, targetRepoUri);
                        if (targetCredentials == null && targetUsername != null)
                                targetCredentials = new SimpleCredentials(targetUsername, targetPassword);
                        targetDefaultSession = targetRepository.login(targetCredentials);

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java
index a6dc5d94f2706cb5af1eb32a935f9249a6dfb534..cad15d64cb2682781bb627d75588b922f583ff19 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java
@@ -38,9 +38,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.ArgeoNames;
 import org.argeo.cms.ArgeoTypes;
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.api.NodeUtils;
 import org.argeo.api.security.Keyring;
 import org.argeo.slc.DefaultNameVersion;
 import org.argeo.slc.NameVersion;
@@ -363,10 +363,10 @@ public class RepoUtils implements ArgeoNames, SlcNames {
                        if (repoNode.isNodeType(ArgeoTypes.ARGEO_REMOTE_REPOSITORY)) {
                                String uri = repoNode.getProperty(ARGEO_URI).getString();
                                if (uri.startsWith("http")) {// http, https
-                                       repository = NodeUtils.getRepositoryByUri(
+                                       repository = CmsJcrUtils.getRepositoryByUri(
                                                        repositoryFactory, uri);
                                } else if (uri.startsWith("vm:")) {// alias
-                                       repository = NodeUtils.getRepositoryByUri(
+                                       repository = CmsJcrUtils.getRepositoryByUri(
                                                        repositoryFactory, uri);
                                } else {
                                        throw new SlcException("Unsupported repository uri " + uri);
@@ -429,7 +429,7 @@ public class RepoUtils implements ArgeoNames, SlcNames {
                        // Anonymous URI only workspace
                        if (repoNode == null)
                                // Anonymous
-                               currRepo = NodeUtils.getRepositoryByUri(repositoryFactory, uri);
+                               currRepo = CmsJcrUtils.getRepositoryByUri(repositoryFactory, uri);
                        else {
                                currRepo = RepoUtils.getRepository(repositoryFactory, keyring,
                                                repoNode);