X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeUserAdmin.java;h=fd9ba31dfbe76ba6cd0e502fc42b042fadbfaa23;hb=89ad04528a66488eb3ad6f51c198d5df3c81b04c;hp=3cc3dbfb39c4e95684e74fb64a78a77717cdd514;hpb=06acf73a99f0e3908fe8998f1ff08dee109c5562;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java
index 3cc3dbfb3..fd9ba31df 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java
@@ -36,6 +36,8 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
+import org.osgi.service.cm.ConfigurationException;
+import org.osgi.service.cm.ManagedService;
 import org.osgi.service.useradmin.Authorization;
 import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.User;
@@ -49,7 +51,7 @@ import bitronix.tm.resource.ehcache.EhCacheXAResourceProducer;
  * Aggregates multiple {@link UserDirectory} and integrates them with this node
  * system roles.
  */
-public class NodeUserAdmin implements UserAdmin, KernelConstants {
+class NodeUserAdmin implements UserAdmin, ManagedService, KernelConstants {
 	private final static Log log = LogFactory.getLog(NodeUserAdmin.class);
 	final static LdapName ROLES_BASE;
 	static {
@@ -86,6 +88,10 @@ public class NodeUserAdmin implements UserAdmin, KernelConstants {
 		new ServiceTracker<>(bc, TransactionManager.class, new TransactionManagerStc()).open();
 	}
 
+	@Override
+	public void updated(Dictionary<String, ?> properties) throws ConfigurationException {
+	}
+
 	private class TransactionManagerStc implements ServiceTrackerCustomizer<TransactionManager, TransactionManager> {
 
 		@Override
@@ -359,7 +365,7 @@ public class NodeUserAdmin implements UserAdmin, KernelConstants {
 		}
 
 		Dictionary<String, ?> nodeRolesProperties = UserAdminConf.uriAsProperties(nodeRolesUri);
-		if (!nodeRolesProperties.get(UserAdminConf.baseDn.property()).equals(baseNodeRoleDn)) {
+		if (!nodeRolesProperties.get(UserAdminConf.baseDn.name()).equals(baseNodeRoleDn)) {
 			throw new CmsException("Invalid base dn for node roles");
 			// TODO deal with "mounted" roles with a different baseDN
 		}