X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeUserAdmin.java;h=dc9d33a3b5fa9bcb7751fb269c288786ba003b7e;hb=c79f5f2275dbbeb7407befc0188344ac16a87a80;hp=077a1f8a7286bf76568fb3547ab53e791e75d258;hpb=35507e18257f2e9f59842ba5120fcd3f19c4cf4d;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 077a1f8a7..dc9d33a3b 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
@@ -29,14 +29,12 @@ import javax.transaction.TransactionManager;
 
 import org.apache.commons.httpclient.auth.AuthPolicy;
 import org.apache.commons.httpclient.auth.CredentialsProvider;
-import org.apache.commons.httpclient.cookie.CookiePolicy;
 import org.apache.commons.httpclient.params.DefaultHttpParams;
 import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.apache.commons.httpclient.params.HttpParams;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
-import org.argeo.cms.internal.http.NodeHttp;
 import org.argeo.cms.internal.http.client.HttpCredentialProvider;
 import org.argeo.cms.internal.http.client.SpnegoAuthScheme;
 import org.argeo.naming.DnsBrowser;
@@ -139,15 +137,15 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
 			log.debug("User directory " + userDirectory.getBaseDn() + " [" + u.getScheme() + "] enabled."
 					+ (realm != null ? " " + realm + " realm." : ""));
 
-		if (!isSystemRolesBaseDn(baseDn)) {
-			if (userAdminReg != null)
-				userAdminReg.unregister();
-			// register self as main user admin
-			Dictionary<String, Object> userAdminregProps = currentState();
-			userAdminregProps.put(NodeConstants.CN, NodeConstants.DEFAULT);
-			userAdminregProps.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
-			userAdminReg = bc.registerService(UserAdmin.class, this, userAdminregProps);
-		}
+		// if (isSystemRolesBaseDn(baseDn)) {
+		if (userAdminReg != null)
+			userAdminReg.unregister();
+		// register self as main user admin
+		Dictionary<String, Object> userAdminregProps = currentState();
+		userAdminregProps.put(NodeConstants.CN, NodeConstants.DEFAULT);
+		userAdminregProps.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
+		userAdminReg = bc.registerService(UserAdmin.class, this, userAdminregProps);
+		// }
 	}
 
 	@Override
@@ -163,14 +161,12 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
 	public String getName() {
 		return "Node User Admin";
 	}
-	
-	
 
 	@Override
 	protected void addAbstractSystemRoles(Authorization rawAuthorization, Set<String> sysRoles) {
-		if(rawAuthorization.getName()==null) {
+		if (rawAuthorization.getName() == null) {
 			sysRoles.add(NodeConstants.ROLE_ANONYMOUS);
-		}else {
+		} else {
 			sysRoles.add(NodeConstants.ROLE_USER);
 		}
 	}
@@ -216,7 +212,7 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
 			// schemes.add(AuthPolicy.BASIC);// incompatible with Basic
 			params.setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, schemes);
 			params.setParameter(CredentialsProvider.PROVIDER, new HttpCredentialProvider());
-			params.setParameter(HttpMethodParams.COOKIE_POLICY, CookiePolicy.BROWSER_COMPATIBILITY);
+			params.setParameter(HttpMethodParams.COOKIE_POLICY, KernelConstants.COOKIE_POLICY_BROWSER_COMPATIBILITY);
 			// params.setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY);
 		}
 	}