Massive package refactoring

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / CmsUserManager.java

diff --git a/org.argeo.cms/src/org/argeo/cms/CmsUserManager.java b/org.argeo.cms/src/org/argeo/cms/CmsUserManager.java
index 040138878603fc1f0cade62ef1cd00be7d58a471..3e7d31e3e3e3dc291030a2e06e91743b80eb9c7c 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/CmsUserManager.java
+++ b/org.argeo.cms/src/org/argeo/cms/CmsUserManager.java
@@ -7,9 +7,11 @@ import java.util.Set;
 
 import javax.security.auth.Subject;
 
-import org.argeo.osgi.useradmin.UserDirectory;
-import org.argeo.util.directory.HierarchyUnit;
+import org.argeo.api.cms.directory.HierarchyUnit;
+import org.argeo.cms.auth.SystemRole;
+import org.argeo.cms.osgi.useradmin.UserDirectory;
 import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.service.useradmin.Group;
 import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.User;
 
@@ -52,12 +54,37 @@ public interface CmsUserManager {
        /** Search among groups including system roles and users if needed */
        List<User> listGroups(String filter, boolean includeUsers, boolean includeSystemRoles);
 
+//     /**
+//      * Lists functional accounts, that is users with regular access to the system
+//      * under this functional hierarchy unit (which probably have technical direct
+//      * sub hierarchy units), excluding groups which are not explicitly users.
+//      */
+//     Set<User> listAccounts(HierarchyUnit hierarchyUnit, boolean deep);
+
        /*
         * EDITION
         */
-       /** Creates a new user.*/
+       /** Creates a new user. */
        User createUser(String username, Map<String, Object> properties, Map<String, Object> credentials);
 
+       /** Creates a group. */
+       Group getOrCreateGroup(HierarchyUnit groups, String commonName);
+
+       /** Creates a new system role. */
+       Group getOrCreateSystemRole(HierarchyUnit roles, SystemRole systemRole);
+
+       /** Add additional object classes to this role. */
+       void addObjectClasses(Role role, Set<String> objectClasses, Map<String, Object> additionalProperties);
+
+       /** Add additional object classes to this hierarchy unit. */
+       void addObjectClasses(HierarchyUnit hierarchyUnit, Set<String> objectClasses,
+                       Map<String, Object> additionalProperties);
+
+       /** Add a member to this group. */
+       void addMember(Group group, Role role);
+       
+       void edit(Runnable action);
+
        /* MISCELLANEOUS */
        /** Returns the dn of a role given its local ID */
        String buildDefaultDN(String localId, int type);
@@ -92,5 +119,5 @@ public interface CmsUserManager {
        UserDirectory getDirectory(Role role);
 
        /** Create a new hierarchy unit. Does nothing if it already exists. */
-       HierarchyUnit createHierarchyUnit(UserDirectory directory, String path);
+       HierarchyUnit getOrCreateHierarchyUnit(UserDirectory directory, String path);
 }
\ No newline at end of file