X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsUserAdmin.java;h=64e32b16a36a7d90e8645777b5e8727c789ec04b;hb=e41a5f598aa4692ee4109e5442e5fcd8565e98bd;hp=64b25c99e80caf71a1ad90c054f2dabba673868c;hpb=e2ffdf6872592aa22d0de2b0ec69ee4eca698c45;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java
index 64b25c99e..64e32b16a 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java
@@ -33,10 +33,8 @@ import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.internal.http.client.HttpCredentialProvider;
 import org.argeo.cms.internal.http.client.SpnegoAuthScheme;
+import org.argeo.osgi.useradmin.DirectoryUserAdmin;
 import org.argeo.osgi.useradmin.AggregatingUserAdmin;
-import org.argeo.osgi.useradmin.LdapUserAdmin;
-import org.argeo.osgi.useradmin.LdifUserAdmin;
-import org.argeo.osgi.useradmin.OsUserDirectory;
 import org.argeo.osgi.useradmin.UserDirectory;
 import org.argeo.util.directory.DirectoryConf;
 import org.argeo.util.naming.dns.DnsBrowser;
@@ -95,18 +93,18 @@ public class CmsUserAdmin extends AggregatingUserAdmin {
 		}
 
 		// Create
-		UserDirectory userDirectory;
-		if (realm != null || DirectoryConf.SCHEME_LDAP.equals(u.getScheme())
-				|| DirectoryConf.SCHEME_LDAPS.equals(u.getScheme())) {
-			userDirectory = new LdapUserAdmin(properties);
-		} else if (DirectoryConf.SCHEME_FILE.equals(u.getScheme())) {
-			userDirectory = new LdifUserAdmin(u, properties);
-		} else if (DirectoryConf.SCHEME_OS.equals(u.getScheme())) {
-			userDirectory = new OsUserDirectory(u, properties);
-			singleUser = true;
-		} else {
-			throw new IllegalArgumentException("Unsupported scheme " + u.getScheme());
-		}
+		UserDirectory userDirectory = new DirectoryUserAdmin(u, properties);
+//		if (realm != null || DirectoryConf.SCHEME_LDAP.equals(u.getScheme())
+//				|| DirectoryConf.SCHEME_LDAPS.equals(u.getScheme())) {
+//			userDirectory = new LdapUserAdmin(properties);
+//		} else if (DirectoryConf.SCHEME_FILE.equals(u.getScheme())) {
+//			userDirectory = new LdifUserAdmin(u, properties);
+//		} else if (DirectoryConf.SCHEME_OS.equals(u.getScheme())) {
+//			userDirectory = new OsUserDirectory(u, properties);
+//			singleUser = true;
+//		} else {
+//			throw new IllegalArgumentException("Unsupported scheme " + u.getScheme());
+//		}
 		String basePath = userDirectory.getContext();
 
 		addUserDirectory(userDirectory);