Refactor deploy properties and move legacy CMS exception.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / osgi / NodeUserAdmin.java

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/osgi/NodeUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/internal/osgi/NodeUserAdmin.java
index 0746d4301d5b324ac61921a56c77d720e342c767..da67c733d0f1c3f0ce5249016b19aa426b7dbee0 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/osgi/NodeUserAdmin.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/osgi/NodeUserAdmin.java
@@ -8,9 +8,8 @@ import java.util.Map;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.internal.runtime.CmsUserAdmin;
-import org.argeo.cms.internal.runtime.KernelConstants;
-import org.argeo.osgi.useradmin.UserAdminConf;
 import org.argeo.osgi.useradmin.UserDirectory;
+import org.argeo.util.directory.DirectoryConf;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedServiceFactory;
@@ -20,7 +19,8 @@ import org.osgi.service.useradmin.UserAdmin;
  * Aggregates multiple {@link UserDirectory} and integrates them with system
  * roles.
  */
-public class NodeUserAdmin extends CmsUserAdmin implements ManagedServiceFactory, KernelConstants {
+@Deprecated
+public class NodeUserAdmin extends CmsUserAdmin implements ManagedServiceFactory {
        private final static CmsLog log = CmsLog.getLog(NodeUserAdmin.class);
 
        // OSGi
@@ -29,7 +29,7 @@ public class NodeUserAdmin extends CmsUserAdmin implements ManagedServiceFactory
        @Override
        public void updated(String pid, Dictionary<String, ?> properties) throws ConfigurationException {
 
-               String basePath = (String) properties.get(UserAdminConf.baseDn.name());
+               String basePath = (String) properties.get(DirectoryConf.baseDn.name());
 
                // FIXME make updates more robust
                if (pidToBaseDn.containsValue(basePath)) {
@@ -44,7 +44,7 @@ public class NodeUserAdmin extends CmsUserAdmin implements ManagedServiceFactory
                regProps.put(Constants.SERVICE_PID, pid);
                if (isSystemRolesBaseDn(basePath))
                        regProps.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
-               regProps.put(UserAdminConf.baseDn.name(), basePath);
+               regProps.put(DirectoryConf.baseDn.name(), basePath);
 
                CmsActivator.getBundleContext().registerService(UserDirectory.class, userDirectory, regProps);
                pidToBaseDn.put(pid, basePath);