Change default home path

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/HomeRepository.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/HomeRepository.java
index 97407866f1d24d2b28a31ff96a6aff641a3e19b6..5c6f419969eed607856e092d66b5e583a256dd8b 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/HomeRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/HomeRepository.java
@@ -28,7 +28,7 @@ import org.argeo.node.NodeUtils;
 class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
        /** The home base path. */
        private String homeBasePath = "/home";
-//     private String peopleBasePath = NodeConstants.PEOPLE_BASE_PATH;
+       // private String peopleBasePath = NodeConstants.PEOPLE_BASE_PATH;
 
        private Set<String> checkedUsers = new HashSet<String>();
 
@@ -87,15 +87,14 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
                        return;
                if (session.getUserID().equals(NodeConstants.ROLE_ANONYMOUS))
                        return;
-//             if (session.getUserID().equals(AuthConstants.ROLE_KERNEL))
-//                     return;
-//             if (session.getUserID().equals(SecurityConstants.ADMIN_ID))
-//                     return;
+               // if (session.getUserID().equals(AuthConstants.ROLE_KERNEL))
+               // return;
+               // if (session.getUserID().equals(SecurityConstants.ADMIN_ID))
+               // return;
 
                if (checkedUsers.contains(username))
                        return;
-               Session adminSession = KernelUtils.openAdminSession(getRepository(),
-                               session.getWorkspace().getName());
+               Session adminSession = KernelUtils.openAdminSession(getRepository(), session.getWorkspace().getName());
                try {
                        syncJcr(adminSession, username);
                        checkedUsers.add(username);
@@ -111,13 +110,12 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
        private void initJcr(Session adminSession) {
                try {
                        JcrUtils.mkdirs(adminSession, homeBasePath);
-//                     JcrUtils.mkdirs(adminSession, peopleBasePath);
+                       // JcrUtils.mkdirs(adminSession, peopleBasePath);
                        adminSession.save();
 
-                       JcrUtils.addPrivilege(adminSession, homeBasePath,
-                                       NodeConstants.ROLE_USER_ADMIN, Privilege.JCR_READ);
-//                     JcrUtils.addPrivilege(adminSession, peopleBasePath,
-//                                     NodeConstants.ROLE_USER_ADMIN, Privilege.JCR_ALL);
+                       JcrUtils.addPrivilege(adminSession, homeBasePath, NodeConstants.ROLE_USER_ADMIN, Privilege.JCR_READ);
+                       // JcrUtils.addPrivilege(adminSession, peopleBasePath,
+                       // NodeConstants.ROLE_USER_ADMIN, Privilege.JCR_ALL);
                        adminSession.save();
                } catch (RepositoryException e) {
                        throw new CmsException("Cannot initialize node user admin", e);
@@ -132,8 +130,7 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
                        if (userHome == null) {
                                String homePath = generateUserPath(homeBasePath, username);
                                if (session.itemExists(homePath))// duplicate user id
-                                       userHome = session.getNode(homePath).getParent()
-                                                       .addNode(JcrUtils.lastPathElement(homePath));
+                                       userHome = session.getNode(homePath).getParent().addNode(JcrUtils.lastPathElement(homePath));
                                else
                                        userHome = JcrUtils.mkdirs(session, homePath);
                                // userHome = JcrUtils.mkfolders(session, homePath);
@@ -142,37 +139,37 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
                                session.save();
 
                                JcrUtils.clearAccessControList(session, homePath, username);
-                               JcrUtils.addPrivilege(session, homePath, username,
-                                               Privilege.JCR_ALL);
+                               JcrUtils.addPrivilege(session, homePath, username, Privilege.JCR_ALL);
                        }
 
-//                     Node userProfile = NodeUtils.getUserProfile(session, username);
-//                     // new user
-//                     if (userProfile == null) {
-//                             String personPath = generateUserPath(peopleBasePath, username);
-//                             Node personBase;
-//                             if (session.itemExists(personPath))// duplicate user id
-//                                     personBase = session.getNode(personPath).getParent()
-//                                                     .addNode(JcrUtils.lastPathElement(personPath));
-//                             else
-//                                     personBase = JcrUtils.mkdirs(session, personPath);
-//                             userProfile = personBase.addNode(ArgeoNames.ARGEO_PROFILE);
-//                             userProfile.addMixin(ArgeoTypes.ARGEO_USER_PROFILE);
-//                             userProfile.setProperty(ArgeoNames.ARGEO_USER_ID, username);
-//                             // userProfile.setProperty(ArgeoNames.ARGEO_ENABLED, true);
-//                             // userProfile.setProperty(ArgeoNames.ARGEO_ACCOUNT_NON_EXPIRED,
-//                             // true);
-//                             // userProfile.setProperty(ArgeoNames.ARGEO_ACCOUNT_NON_LOCKED,
-//                             // true);
-//                             // userProfile.setProperty(ArgeoNames.ARGEO_CREDENTIALS_NON_EXPIRED,
-//                             // true);
-//                             session.save();
-//
-//                             JcrUtils.clearAccessControList(session, userProfile.getPath(),
-//                                             username);
-//                             JcrUtils.addPrivilege(session, userProfile.getPath(), username,
-//                                             Privilege.JCR_READ);
-//                     }
+                       // Node userProfile = NodeUtils.getUserProfile(session, username);
+                       // // new user
+                       // if (userProfile == null) {
+                       // String personPath = generateUserPath(peopleBasePath, username);
+                       // Node personBase;
+                       // if (session.itemExists(personPath))// duplicate user id
+                       // personBase = session.getNode(personPath).getParent()
+                       // .addNode(JcrUtils.lastPathElement(personPath));
+                       // else
+                       // personBase = JcrUtils.mkdirs(session, personPath);
+                       // userProfile = personBase.addNode(ArgeoNames.ARGEO_PROFILE);
+                       // userProfile.addMixin(ArgeoTypes.ARGEO_USER_PROFILE);
+                       // userProfile.setProperty(ArgeoNames.ARGEO_USER_ID, username);
+                       // // userProfile.setProperty(ArgeoNames.ARGEO_ENABLED, true);
+                       // // userProfile.setProperty(ArgeoNames.ARGEO_ACCOUNT_NON_EXPIRED,
+                       // // true);
+                       // // userProfile.setProperty(ArgeoNames.ARGEO_ACCOUNT_NON_LOCKED,
+                       // // true);
+                       // //
+                       // userProfile.setProperty(ArgeoNames.ARGEO_CREDENTIALS_NON_EXPIRED,
+                       // // true);
+                       // session.save();
+                       //
+                       // JcrUtils.clearAccessControList(session, userProfile.getPath(),
+                       // username);
+                       // JcrUtils.addPrivilege(session, userProfile.getPath(), username,
+                       // Privilege.JCR_READ);
+                       // }
 
                        // Remote roles
                        // if (roles != null) {
@@ -180,11 +177,10 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
                        // }
                        if (session.hasPendingChanges())
                                session.save();
-//                     return userProfile;
+                       // return userProfile;
                } catch (RepositoryException e) {
                        JcrUtils.discardQuietly(session);
-                       throw new CmsException("Cannot sync node security model for "
-                                       + username, e);
+                       throw new CmsException("Cannot sync node security model for " + username, e);
                }
        }
 
@@ -201,14 +197,11 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
                if (atIndex > 0) {
                        String domain = userId.substring(0, atIndex);
                        String name = userId.substring(atIndex + 1);
-                       return base + '/' + JcrUtils.firstCharsToPath(domain, 2) + '/'
-                                       + domain + '/' + JcrUtils.firstCharsToPath(name, 2) + '/'
-                                       + name;
+                       return base + '/' + domain + '/' + name;
                } else if (atIndex == 0 || atIndex == (userId.length() - 1)) {
                        throw new CmsException("Unsupported username " + userId);
                } else {
-                       return base + '/' + JcrUtils.firstCharsToPath(userId, 2) + '/'
-                                       + userId;
+                       return base + '/' + userId;
                }
        }