Improve CMS workspace indexer.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / HomeRepository.java

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 1b50023e650359130c656f9c8cbacc888a59467f..aa0f1fc3f53d287e5a1c1b946c6184f8fa84dce9 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
@@ -58,7 +58,7 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
                                @Override
                                public Void run() {
                                        try {
-                                               Session adminSession = getRepository().login();
+                                               Session adminSession = getDefaultRepository().login();
                                                initJcr(adminSession);
                                        } catch (RepositoryException e) {
                                                throw new CmsException("Cannot init JCR home", e);
@@ -71,7 +71,7 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
        }
 
        @Override
-       protected void processNewSession(Session session) {
+       protected void processNewSession(Session session, String workspaceName) {
                String username = session.getUserID();
                if (username == null || username.toString().equals(""))
                        return;
@@ -80,9 +80,9 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
 
                if (checkedUsers.contains(username))
                        return;
-               Session adminSession = KernelUtils.openAdminSession(getRepository(), session.getWorkspace().getName());
+               Session adminSession = KernelUtils.openAdminSession(getRepository(workspaceName), workspaceName);
                try {
-                       syncJcr(adminSession, username);
+                       syncJcr(adminSession, username, workspaceName);
                        checkedUsers.add(username);
                } finally {
                        JcrUtils.logoutQuietly(adminSession);
@@ -109,28 +109,35 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
                }
        }
 
-       private void syncJcr(Session session, String username) {
+       protected synchronized void syncJcr(Session adminSession, String username, String workspaceName) {
+               // only in the default workspace
+               if (workspaceName != null)
+                       return;
+               // skip system users
+               if (username.endsWith(NodeConstants.ROLES_BASEDN))
+                       return;
+
                try {
-                       Node userHome = NodeUtils.getUserHome(session, username);
+                       Node userHome = NodeUtils.getUserHome(adminSession, username);
                        if (userHome == null) {
                                String homePath = generateUserPath(username);
-                               if (session.itemExists(homePath))// duplicate user id
-                                       userHome = session.getNode(homePath).getParent().addNode(JcrUtils.lastPathElement(homePath));
+                               if (adminSession.itemExists(homePath))// duplicate user id
+                                       userHome = adminSession.getNode(homePath).getParent().addNode(JcrUtils.lastPathElement(homePath));
                                else
-                                       userHome = JcrUtils.mkdirs(session, homePath);
+                                       userHome = JcrUtils.mkdirs(adminSession, homePath);
                                // userHome = JcrUtils.mkfolders(session, homePath);
                                userHome.addMixin(NodeTypes.NODE_USER_HOME);
                                userHome.addMixin(NodeType.MIX_CREATED);
                                userHome.setProperty(NodeNames.LDAP_UID, username);
-                               session.save();
+                               adminSession.save();
 
-                               JcrUtils.clearAccessControList(session, homePath, username);
-                               JcrUtils.addPrivilege(session, homePath, username, Privilege.JCR_ALL);
+                               JcrUtils.clearAccessControList(adminSession, homePath, username);
+                               JcrUtils.addPrivilege(adminSession, homePath, username, Privilege.JCR_ALL);
                        }
-                       if (session.hasPendingChanges())
-                               session.save();
+                       if (adminSession.hasPendingChanges())
+                               adminSession.save();
                } catch (RepositoryException e) {
-                       JcrUtils.discardQuietly(session);
+                       JcrUtils.discardQuietly(adminSession);
                        throw new CmsException("Cannot sync node security model for " + username, e);
                }
        }
@@ -188,4 +195,8 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
 
        }
 
+       public boolean isRemote() {
+               return remote;
+       }
+
 }