Manage users as content.

diff --git a/org.argeo.app.api/src/org/argeo/app/api/EntityType.java b/org.argeo.app.api/src/org/argeo/app/api/EntityType.java
index 48b1266b00edfc3e7f118c8a072e4d1d9ce0bc88..bb7b3de7bf1dfc75892b2c1d650abc3158c6aed0 100644 (file)
--- a/org.argeo.app.api/src/org/argeo/app/api/EntityType.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/EntityType.java
@@ -1,7 +1,9 @@
 package org.argeo.app.api;
 
+import org.argeo.util.naming.QNamed;
+
 /** Types related to entities. */
-public enum EntityType implements JcrName {
+public enum EntityType implements JcrName,QNamed {
        // entity
        entity, local, relatedTo,
        // structure
@@ -17,26 +19,34 @@ public enum EntityType implements JcrName {
        // ldap
        person, user;
 
+       
+       
        @Override
-       public String getPrefix() {
-               return prefix();
+       public String getDefaultPrefix() {
+               // TODO Auto-generated method stub
+               return "entity";
        }
 
-       public static String prefix() {
-               return "entity";
+       @Override
+       public String getPrefix() {
+               return getDefaultPrefix();
        }
 
+//     public static String prefix() {
+//             return "entity";
+//     }
+
        public String basePath() {
                return '/' + name();
        }
 
        @Override
        public String getNamespace() {
-               return namespace();
+               return  "http://www.argeo.org/ns/entity";
        }
 
-       public static String namespace() {
-               return "http://www.argeo.org/ns/entity";
-       }
+//     public static String namespace() {
+//             return "http://www.argeo.org/ns/entity";
+//     }
 
 }

diff --git a/org.argeo.app.api/src/org/argeo/app/api/JcrName.java b/org.argeo.app.api/src/org/argeo/app/api/JcrName.java
index 182494a7fc77fe33b8d726a8fb726eeb84c1cafc..e93b56d63a7be013fc5b3d5b88f34bffb670fa87 100644 (file)
--- a/org.argeo.app.api/src/org/argeo/app/api/JcrName.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/JcrName.java
@@ -4,6 +4,7 @@ import java.util.function.Supplier;
 
 /** Can be applied to {@link Enum}s in order to generate prefixed names. */
 @FunctionalInterface
+@Deprecated
 public interface JcrName extends Supplier<String> {
        String name();
 

diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
index 679f46d7420e21a8cc0a5897a5ef30590f33a3a7..b901a113c0d856fb8254b2623cb4f019a434a3f0 100644 (file)
--- a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
@@ -351,7 +351,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 
                } else {
 
-                       List<QName> objectClasses = content.getTypes();
+                       List<QName> objectClasses = content.getContentClasses();
                        Set<String> types = new TreeSet<>();
                        for (QName cc : objectClasses) {
                                String type = cc.getPrefix() + ":" + cc.getLocalPart();

diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java
index 68e760c87a2c18013cba87a8f090d24d0f47cae6..50b012e8fb33742f2a105480437741922b384346 100644 (file)
--- a/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java
@@ -1,7 +1,5 @@
 package org.argeo.app.ui.people;
 
-import static org.argeo.cms.auth.UserAdminUtils.getProperty;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,6 +15,7 @@ import org.argeo.app.ui.SuiteEvent;
 import org.argeo.app.ui.SuiteIcon;
 import org.argeo.app.ui.dialogs.NewUserWizard;
 import org.argeo.cms.CmsUserManager;
+import org.argeo.cms.acr.ContentUtils;
 import org.argeo.cms.auth.CmsRole;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.auth.UserAdminUtils;
@@ -36,6 +35,7 @@ import org.argeo.osgi.useradmin.UserDirectory;
 import org.argeo.util.LangUtils;
 import org.argeo.util.directory.HierarchyUnit;
 import org.argeo.util.naming.LdapAttrs;
+import org.argeo.util.naming.LdapObjs;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.swt.SWT;
@@ -64,7 +64,6 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
                parent.setLayout(new GridLayout());
 
                ContentSession contentSession = contentRepository.get();
-
                SashForm sashForm = new SashForm(parent, SWT.VERTICAL);
                CmsSwtUtils.fill(sashForm);
 
@@ -118,7 +117,7 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
                };
 
                TabularPart usersView = new SwtTabularPart(sashForm, SWT.NONE) {
-                       List<Role> roles = new ArrayList<>();
+                       List<Content> roles = new ArrayList<>();
 
                        @Override
                        protected Object getData(int row) {
@@ -153,8 +152,10 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
                                for (HierarchyUnit directChild : hu.getDirectHierachyUnits(false)) {
                                        if (!directChild.isFunctional()) {
                                                for (Role r : ud.getHierarchyUnitRoles(directChild, null, false)) {
+                                                       Content content = ContentUtils.roleToContent(cmsUserManager, contentSession, r);
                                                        // if (r instanceof Person || r instanceof Organization)
-                                                       roles.add(r);
+                                                       if (content.hasContentClass(LdapObjs.inetOrgPerson.qName(), LdapObjs.organization.qName()))
+                                                               roles.add(content);
                                                }
                                        }
                                }
@@ -163,29 +164,30 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
                        }
 
                };
-               usersView.addColumn(new Column<Role>() {
+               usersView.addColumn(new Column<Content>() {
 
                        @Override
-                       public String getText(Role role) {
-                               String txt = getProperty(role, LdapAttrs.o);
-                               if (txt != null && !txt.equals(""))
-                                       return txt;
-                               txt = getProperty(role, LdapAttrs.cn);
-                               if (txt != null && !txt.equals(""))
-                                       return txt;
-                               txt = UserAdminUtils.getUserDisplayName(role);
-                               return txt;
+                       public String getText(Content role) {
+                               if (role.isContentClass(LdapObjs.inetOrgPerson.qName()))
+                                       return UserAdminUtils.getUserDisplayName(role.adapt(User.class));
+                               else if (role.isContentClass(LdapObjs.organization.qName()))
+                                       return role.attr(LdapAttrs.o.qName());
+                               else if (role.isContentClass(LdapObjs.groupOfNames.qName()))
+                                       return role.attr(LdapAttrs.cn.qName());
+                               else
+                                       return null;
                        }
 
                        @Override
-                       public CmsIcon getIcon(Role role) {
-                               String txt = getProperty(role, LdapAttrs.o);
-                               if (txt != null && !txt.equals(""))
-                                       return SuiteIcon.organisation;
-                               txt = getProperty(role, LdapAttrs.uid);
-                               if (txt != null && !txt.equals(""))
+                       public CmsIcon getIcon(Content role) {
+                               if (role.isContentClass(LdapObjs.inetOrgPerson.qName()))
                                        return SuiteIcon.person;
-                               return SuiteIcon.group;
+                               else if (role.isContentClass(LdapObjs.organization.qName()))
+                                       return SuiteIcon.organisation;
+                               else if (role.isContentClass(LdapObjs.groupOfNames.qName()))
+                                       return SuiteIcon.group;
+                               else
+                                       return null;
                        }
 
                        @Override
@@ -194,7 +196,7 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
                        }
 
                });
-               usersView.addColumn((Column<Role>) (role) -> getProperty(role, LdapAttrs.mail));
+               usersView.addColumn((Column<Content>) (role) -> role.attr(LdapAttrs.mail.qName()));
 
                // toolbar
                Composite bottom = new Composite(parent, SWT.NONE);
@@ -219,7 +221,7 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
                });
 
                usersView.onSelected((o) -> {
-                       User user = (User) o;
+                       Content user = (Content) o;
                        if (user != null) {
                                cmsView.sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(user));
                                deleteItem.setEnabled(true);
@@ -229,7 +231,7 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
                });
 
                usersView.onAction((o) -> {
-                       User user = (User) o;
+                       Content user = (Content) o;
                        if (user != null) {
                                cmsView.sendEvent(SuiteEvent.openNewPart.topic(), SuiteEvent.eventProperties(user));
                        }