Documentation

diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/jcr/JcrUtils.java b/jcr/org.argeo.cms.jcr/src/org/argeo/jcr/JcrUtils.java
index 3be8be184b25f269d581d09f2bf541980883143d..1f1fa11217d01e76a5bbf96d4652de4c5459c5b6 100644 (file)
--- a/jcr/org.argeo.cms.jcr/src/org/argeo/jcr/JcrUtils.java
+++ b/jcr/org.argeo.cms.jcr/src/org/argeo/jcr/JcrUtils.java
@@ -1144,6 +1144,14 @@ public class JcrUtils {
                                // try to create workspace
                                defaultSession = repository.login(credentials);
                                defaultSession.getWorkspace().createWorkspace(workspaceName);
+
+                               // work around non-atomicity of workspace creation in Jackrabbit
+//                             try {
+//                                     Thread.sleep(5000);
+//                             } catch (InterruptedException e1) {
+//                                     // ignore
+//                             }
+                               
                                workspaceSession = repository.login(credentials, workspaceName);
                        }
                        return workspaceSession;

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
index c8e137ee9180242d8832d9533820f43981268181..a8a322356f45a52893a25af3c3c6c02be107d7d9 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
@@ -94,7 +94,7 @@ public class CmsUserManagerImpl implements CmsUserManager {
 
        // ALL USER: WARNING access to this will be later reduced
 
-       /** Retrieve a user given his dn */
+       /** Retrieve a user given his dn, or <code>null</code> if it doesn't exist. */
        public User getUser(String dn) {
                return (User) getUserAdmin().getRole(dn);
        }
@@ -139,8 +139,6 @@ public class CmsUserManagerImpl implements CmsUserManager {
                addUsers(users, group, filter);
                return users;
        }
-       
-       
 
 //     @Override
 //     public Set<User> listAccounts(HierarchyUnit hierarchyUnit, boolean deep) {
@@ -184,7 +182,8 @@ public class CmsUserManagerImpl implements CmsUserManager {
                List<User> users = new ArrayList<User>();
                for (Role role : roles) {
                        if ((includeUsers && role.getType() == Role.USER || role.getType() == Role.GROUP) && !users.contains(role)
-                                       && (includeSystemRoles || !role.getName().toLowerCase().endsWith(CmsConstants.SYSTEM_ROLES_BASEDN))) {
+                                       && (includeSystemRoles
+                                                       || !role.getName().toLowerCase().endsWith(CmsConstants.SYSTEM_ROLES_BASEDN))) {
                                if (match(role, filter))
                                        users.add((User) role);
                        }