X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2FSuiteApp.java;h=204688d81b360bf7c9b34673ced7d55c33ec70b3;hb=330996fb36d95edaf30d0dc2086aa549155464c3;hp=2298145b220c9cf590f3504e04c1efa5d0e75461;hpb=242098dba4f7b96f4b120f8a7aa151b7e4b2ce77;p=gpl%2Fargeo-suite.git 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 2298145..204688d 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java @@ -1,7 +1,6 @@ package org.argeo.app.ui; import static org.argeo.api.cms.CmsView.CMS_VIEW_UID_PROPERTY; -import static org.argeo.cms.acr.ContentUtils.SLASH; import java.util.Collections; import java.util.HashMap; @@ -17,8 +16,6 @@ import java.util.TreeSet; import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.jcr.nodetype.NodeType; -import javax.naming.InvalidNameException; -import javax.naming.ldap.LdapName; import javax.xml.namespace.QName; import org.argeo.api.acr.Content; @@ -34,12 +31,10 @@ import org.argeo.app.api.EntityConstants; import org.argeo.app.api.EntityNames; import org.argeo.app.api.EntityType; import org.argeo.app.api.RankedObject; -import org.argeo.app.core.SuiteUtils; import org.argeo.cms.AbstractCmsApp; import org.argeo.cms.CmsUserManager; import org.argeo.cms.LocaleUtils; import org.argeo.cms.Localized; -import org.argeo.cms.acr.CmsContentRepository; import org.argeo.cms.acr.ContentUtils; import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.cms.jcr.acr.JcrContent; @@ -49,8 +44,6 @@ import org.argeo.cms.ui.CmsUiProvider; import org.argeo.cms.ux.CmsUxUtils; import org.argeo.eclipse.ui.specific.UiContext; import org.argeo.jcr.JcrException; -import org.argeo.osgi.useradmin.LdapNameUtils; -import org.argeo.osgi.useradmin.UserDirectory; import org.argeo.util.LangUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -579,10 +572,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { User user = cmsUserManager.getUser(username); if (user == null) return null; - UserDirectory userDirectory = cmsUserManager.getUserDirectory(user); - path = CmsContentRepository.DIRECTORY_BASE + SLASH + userDirectory.getBasePath() + SLASH - + LdapNameUtils.toRevertPath(username, userDirectory.getBasePath()); - node = contentSession.get(path); + node = ContentUtils.roleToContent(cmsUserManager, contentSession, user); // LdapName userDn; // try { // userDn = new LdapName(user.getName());