import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Dictionary;
+import java.util.Hashtable;
import java.util.List;
import java.util.Locale;
import java.util.UUID;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.argeo.cms.auth.AuthConstants;
import org.argeo.cms.maintenance.MaintenanceUi;
import org.argeo.node.NodeConstants;
import org.argeo.node.NodeState;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.ManagedServiceFactory;
-import org.osgi.service.useradmin.UserAdmin;
import bitronix.tm.BitronixTransactionManager;
import bitronix.tm.BitronixTransactionSynchronizationRegistry;
}
private void initServices() {
+ // JTA
initTransactionManager();
// JCR
bc.registerService(RepositoryFactory.class, repositoryFactory, null);
// Security
- NodeUserAdmin userAdmin = new NodeUserAdmin();
+ NodeUserAdmin userAdmin = new NodeUserAdmin(AuthConstants.ROLES_BASEDN);
shutdownHooks.add(() -> userAdmin.destroy());
- Dictionary<String, Object> props = userAdmin.currentState();
+ Dictionary<String, Object> props = new Hashtable<>();
props.put(Constants.SERVICE_PID, NodeConstants.NODE_USER_ADMIN_PID);
- bc.registerService(UserAdmin.class, userAdmin, props);
+ bc.registerService(ManagedServiceFactory.class, userAdmin, props);
// UI
bc.registerService(ApplicationConfiguration.class, new MaintenanceUi(),
LangUtils.init(KernelConstants.CONTEXT_NAME_PROP, "system"));
- bc.registerService(ApplicationConfiguration.class, new UserUi(), LangUtils.init(KernelConstants.CONTEXT_NAME_PROP, "user"));
+ bc.registerService(ApplicationConfiguration.class, new UserUi(),
+ LangUtils.init(KernelConstants.CONTEXT_NAME_PROP, "user"));
}
private void initTransactionManager() {