Massive Argeo APIs refactoring

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

diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/EgoRepository.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/EgoRepository.java
index 68bfce8d8b788f4bad4faa1eb4bfe960078423a0..29802509617bcc0545f4db86596dee380c491046 100644 (file)
--- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/EgoRepository.java
+++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/EgoRepository.java
@@ -17,9 +17,10 @@ import javax.naming.ldap.LdapName;
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 
-import org.argeo.api.NodeConstants;
-import org.argeo.api.NodeUtils;
+import org.argeo.api.cms.CmsAuth;
+import org.argeo.api.cms.CmsConstants;
 import org.argeo.cms.CmsException;
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrRepositoryWrapper;
 import org.argeo.jcr.JcrUtils;
@@ -38,19 +39,19 @@ class EgoRepository extends JcrRepositoryWrapper implements KernelConstants {
 
        private SimpleDateFormat usersDatePath = new SimpleDateFormat("YYYY/MM");
 
-       private String defaultHomeWorkspace = NodeConstants.HOME_WORKSPACE;
-       private String defaultGroupsWorkspace = NodeConstants.SRV_WORKSPACE;
+       private String defaultHomeWorkspace = CmsConstants.HOME_WORKSPACE;
+       private String defaultGroupsWorkspace = CmsConstants.SRV_WORKSPACE;
 //     private String defaultGuestsWorkspace = NodeConstants.GUESTS_WORKSPACE;
        private final boolean remote;
 
        public EgoRepository(Repository repository, boolean remote) {
                super(repository);
                this.remote = remote;
-               putDescriptor(NodeConstants.CN, NodeConstants.EGO_REPOSITORY);
+               putDescriptor(CmsConstants.CN, CmsConstants.EGO_REPOSITORY);
                if (!remote) {
                        LoginContext lc;
                        try {
-                               lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN);
+                               lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_DATA_ADMIN);
                                lc.login();
                        } catch (javax.security.auth.login.LoginException e1) {
                                throw new IllegalStateException("Cannot login as system", e1);
@@ -112,7 +113,7 @@ class EgoRepository extends JcrRepositoryWrapper implements KernelConstants {
                String username = session.getUserID();
                if (username == null || username.toString().equals(""))
                        return;
-               if (session.getUserID().equals(NodeConstants.ROLE_ANONYMOUS))
+               if (session.getUserID().equals(CmsConstants.ROLE_ANONYMOUS))
                        return;
 
                String userHomeWorkspace = getUserHomeWorkspace();
@@ -155,11 +156,11 @@ class EgoRepository extends JcrRepositoryWrapper implements KernelConstants {
 //             if (workspaceName != null)
 //                     return;
                // skip system users
-               if (username.endsWith(NodeConstants.ROLES_BASEDN))
+               if (username.endsWith(CmsConstants.ROLES_BASEDN))
                        return;
 
                try {
-                       Node userHome = NodeUtils.getUserHome(adminSession, username);
+                       Node userHome = CmsJcrUtils.getUserHome(adminSession, username);
                        if (userHome == null) {
 //                             String homePath = generateUserPath(username);
                                String userId = extractUserId(username);
@@ -229,7 +230,7 @@ class EgoRepository extends JcrRepositoryWrapper implements KernelConstants {
                String groupsWorkspace = getGroupsWorkspace();
                Session adminSession = KernelUtils.openAdminSession(getRepository(groupsWorkspace), groupsWorkspace);
                String cn = dn.getRdn(dn.size() - 1).getValue().toString();
-               Node newWorkgroup = NodeUtils.getGroupHome(adminSession, cn);
+               Node newWorkgroup = CmsJcrUtils.getGroupHome(adminSession, cn);
                if (newWorkgroup != null) {
                        JcrUtils.logoutQuietly(adminSession);
                        throw new CmsException("Workgroup " + newWorkgroup + " already exists for " + dn);