X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fauth%2FCmsUserManagerImpl.java;h=9b7a2ed423c1331bcf7c8d05dcd0fb0a03fe923c;hb=4672ec9d1071dffc7c591f623898d32a31637d04;hp=e6a305685e4920115e63478b6e3c4b623a4663ea;hpb=99bca5f6b71c24837c23cf2a9bb944e09dca3dea;p=lgpl%2Fargeo-commons.git

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 e6a305685..9b7a2ed42 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
@@ -31,13 +31,13 @@ import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.auth.UserAdminUtils;
-import org.argeo.osgi.transaction.WorkTransaction;
 import org.argeo.osgi.useradmin.TokenUtils;
 import org.argeo.osgi.useradmin.UserAdminConf;
 import org.argeo.osgi.useradmin.UserDirectory;
 import org.argeo.util.naming.LdapAttrs;
 import org.argeo.util.naming.NamingUtils;
 import org.argeo.util.naming.SharedSecret;
+import org.argeo.util.transaction.WorkTransaction;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.useradmin.Authorization;
 import org.osgi.service.useradmin.Group;
@@ -232,7 +232,7 @@ public class CmsUserManagerImpl implements CmsUserManager {
 		Map<String, String> dns = new HashMap<String, String>();
 		for (UserDirectory userDirectory : userDirectories.keySet()) {
 			Boolean readOnly = userDirectory.isReadOnly();
-			String baseDn = userDirectory.getGlobalId();
+			String baseDn = userDirectory.getContext();
 
 			if (onlyWritable && readOnly)
 				continue;
@@ -247,7 +247,7 @@ public class CmsUserManagerImpl implements CmsUserManager {
 	}
 
 	public Set<UserDirectory> getUserDirectories() {
-		TreeSet<UserDirectory> res = new TreeSet<>((o1, o2) -> o1.getGlobalId().compareTo(o2.getGlobalId()));
+		TreeSet<UserDirectory> res = new TreeSet<>((o1, o2) -> o1.getContext().compareTo(o2.getContext()));
 		res.addAll(userDirectories.keySet());
 		return res;
 	}
@@ -441,12 +441,12 @@ public class CmsUserManagerImpl implements CmsUserManager {
 	}
 
 	@Override
-	public UserDirectory getUserDirectory(User user) {
+	public UserDirectory getDirectory(Role user) {
 		String name = user.getName();
 		NavigableMap<String, UserDirectory> possible = new TreeMap<>();
 		for (UserDirectory userDirectory : userDirectories.keySet()) {
-			if (name.endsWith(userDirectory.getGlobalId())) {
-				possible.put(userDirectory.getGlobalId(), userDirectory);
+			if (name.endsWith(userDirectory.getContext())) {
+				possible.put(userDirectory.getContext(), userDirectory);
 			}
 		}
 		if (possible.size() == 0)