X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.util%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FAggregatingUserAdmin.java;h=79d2bd3cbc2f21142f1801a1df5c5fbc307c2095;hb=336930c69f0cd3e1242e518479624c6366541275;hp=3857b08d0607027cf55e0a4b72528de70135b7e7;hpb=7e464c3cedfa41ece64811fb55ddc9ce740a1050;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java b/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
index 3857b08d0..79d2bd3cb 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
+++ b/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
@@ -238,7 +238,11 @@ public class AggregatingUserAdmin implements UserAdmin {
 //		return res;
 //	}
 
-	public void destroy() {
+	public void start() {
+
+	}
+
+	public void stop() {
 		for (LdapName name : businessRoles.keySet()) {
 			DirectoryUserAdmin userDirectory = businessRoles.get(name);
 			destroy(userDirectory);
@@ -254,6 +258,14 @@ public class AggregatingUserAdmin implements UserAdmin {
 		userDirectory.destroy();
 	}
 
+//	protected void removeUserDirectory(UserDirectory userDirectory) {
+//		LdapName baseDn = toLdapName(userDirectory.getContext());
+//		businessRoles.remove(baseDn);
+//		if (userDirectory instanceof DirectoryUserAdmin)
+//			destroy((DirectoryUserAdmin) userDirectory);
+//	}
+
+	@Deprecated
 	protected void removeUserDirectory(String basePath) {
 		if (isSystemRolesBaseDn(basePath))
 			throw new IllegalArgumentException("System roles cannot be removed ");
@@ -274,6 +286,8 @@ public class AggregatingUserAdmin implements UserAdmin {
 	public Set<UserDirectory> getUserDirectories() {
 		TreeSet<UserDirectory> res = new TreeSet<>((o1, o2) -> o1.getContext().compareTo(o2.getContext()));
 		res.addAll(businessRoles.values());
+		res.add(systemRoles);
 		return res;
 	}
+
 }