X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeSecurity.java;fp=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeSecurity.java;h=3b5d78d897ff24f6a9ff5b2765af13eb79c1d35c;hb=93a457cf047cebb0170abd0f37a9b4291a2ae3e9;hp=f279ba5eab329d02ed5010ee2a848475c2d3b47d;hpb=5919d9b34f86dd14afc65547cb5a8ccc083d6482;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeSecurity.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeSecurity.java
index f279ba5ea..3b5d78d89 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeSecurity.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeSecurity.java
@@ -10,6 +10,7 @@ import org.argeo.cms.CmsException;
 import org.argeo.cms.internal.useradmin.JcrUserAdmin;
 import org.argeo.cms.internal.useradmin.SimpleJcrSecurityModel;
 import org.argeo.cms.internal.useradmin.jackrabbit.JackrabbitUserAdminService;
+import org.argeo.osgi.useradmin.LdifUserAdmin;
 import org.argeo.security.OsAuthenticationToken;
 import org.argeo.security.UserAdminService;
 import org.argeo.security.core.InternalAuthentication;
@@ -36,7 +37,7 @@ class NodeSecurity implements AuthenticationManager {
 	private final InternalAuthenticationProvider internalAuth;
 	private final AnonymousAuthenticationProvider anonymousAuth;
 	private final JackrabbitUserAdminService userAdminService;
-	private final JcrUserAdmin userAdmin;
+	private final LdifUserAdmin userAdmin;
 
 	private ServiceRegistration<AuthenticationManager> authenticationManagerReg;
 	private ServiceRegistration<UserAdminService> userAdminServiceReg;
@@ -46,11 +47,6 @@ class NodeSecurity implements AuthenticationManager {
 
 	public NodeSecurity(BundleContext bundleContext, JackrabbitNode node)
 			throws RepositoryException {
-		URL url = getClass().getClassLoader().getResource(
-				KernelConstants.JAAS_CONFIG);
-		System.setProperty("java.security.auth.login.config",
-				url.toExternalForm());
-
 		this.bundleContext = bundleContext;
 
 		osAuth = new OsAuthenticationProvider();
@@ -65,8 +61,11 @@ class NodeSecurity implements AuthenticationManager {
 		userAdminService.setSecurityModel(new SimpleJcrSecurityModel());
 		userAdminService.init();
 
-		userAdmin = new JcrUserAdmin(bundleContext, node);
-		userAdmin.setUserAdminService(userAdminService);
+		String userAdminUri = KernelUtils
+				.getFrameworkProp(KernelConstants.USERADMIN_URI);
+		if (userAdminUri == null)
+			userAdminUri = getClass().getResource("demo.ldif").toString();
+		userAdmin = new LdifUserAdmin(userAdminUri);
 	}
 
 	public void publish() {