Massive Argeo APIs refactoring

[lgpl/argeo-commons.git] / org.argeo.cms.jcr / src / org / argeo / cms / jcr / internal / CmsFsProvider.java

diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsFsProvider.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsFsProvider.java
index 704adf15fc0bd7f49d23366d33ec9b2c96a03305..50ef25e9a6726a4c4c4148081aaab856e12b20b9 100644 (file)
--- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsFsProvider.java
+++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsFsProvider.java
@@ -18,9 +18,9 @@ import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 
-import org.argeo.api.NodeConstants;
-import org.argeo.api.NodeUtils;
+import org.argeo.api.cms.CmsConstants;
 import org.argeo.cms.auth.CurrentUser;
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.jackrabbit.fs.AbstractJackrabbitFsProvider;
 import org.argeo.jcr.fs.JcrFileSystem;
 import org.argeo.jcr.fs.JcrFileSystemProvider;
@@ -35,7 +35,7 @@ public class CmsFsProvider extends AbstractJackrabbitFsProvider {
 
        @Override
        public String getScheme() {
-               return NodeConstants.SCHEME_NODE;
+               return CmsConstants.SCHEME_NODE;
        }
 
        @Override
@@ -54,13 +54,13 @@ public class CmsFsProvider extends AbstractJackrabbitFsProvider {
                        if (host != null && !host.trim().equals("")) {
                                URI repoUri = new URI("http", uri.getUserInfo(), uri.getHost(), uri.getPort(), "/jcr/node", null, null);
                                RepositoryFactory repositoryFactory = bc.getService(bc.getServiceReference(RepositoryFactory.class));
-                               Repository repository = NodeUtils.getRepositoryByUri(repositoryFactory, repoUri.toString());
+                               Repository repository = CmsJcrUtils.getRepositoryByUri(repositoryFactory, repoUri.toString());
                                CmsFileSystem fileSystem = new CmsFileSystem(this, repository);
                                fileSystems.put(username, fileSystem);
                                return fileSystem;
                        } else {
                                Repository repository = bc.getService(
-                                               bc.getServiceReferences(Repository.class, "(cn=" + NodeConstants.EGO_REPOSITORY + ")")
+                                               bc.getServiceReferences(Repository.class, "(cn=" + CmsConstants.EGO_REPOSITORY + ")")
                                                                .iterator().next());
 //                             Session session = repository.login();
                                CmsFileSystem fileSystem = new CmsFileSystem(this, repository);
@@ -97,8 +97,8 @@ public class CmsFsProvider extends AbstractJackrabbitFsProvider {
 
        public Node getUserHome(Repository repository) {
                try {
-                       Session session = repository.login(NodeConstants.HOME_WORKSPACE);
-                       return NodeUtils.getUserHome(session);
+                       Session session = repository.login(CmsConstants.HOME_WORKSPACE);
+                       return CmsJcrUtils.getUserHome(session);
                } catch (RepositoryException e) {
                        throw new IllegalStateException("Cannot get user home", e);
                }