X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsUserAdmin.java;h=7f4314b996bc9a0c9d7c5f8042c10445fbaf81e2;hb=b897c27d370ad4772b5ae4b2c22cc505ef5d1a3f;hp=ecb7b8c1c3355afe214ca32b933651b6f863bf42;hpb=79c14508549e1af042485b4f888a3c54f5a68833;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java
index ecb7b8c1c..7f4314b99 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java
@@ -65,7 +65,7 @@ public class CmsUserAdmin extends AggregatingUserAdmin {
 	private CmsState cmsState;
 
 	public CmsUserAdmin() {
-		super(CmsConstants.ROLES_BASEDN, CmsConstants.TOKENS_BASEDN);
+		super(CmsConstants.SYSTEM_ROLES_BASEDN, CmsConstants.TOKENS_BASEDN);
 	}
 
 	public void start() {
@@ -93,7 +93,7 @@ public class CmsUserAdmin extends AggregatingUserAdmin {
 
 		// node roles
 		String nodeRolesUri = null;// getFrameworkProp(CmsConstants.ROLES_URI);
-		String baseNodeRoleDn = CmsConstants.ROLES_BASEDN;
+		String baseNodeRoleDn = CmsConstants.SYSTEM_ROLES_BASEDN;
 		if (nodeRolesUri == null && nodeBase != null) {
 			nodeRolesUri = baseNodeRoleDn + ".ldif";
 			Path nodeRolesFile = nodeBase.resolve(nodeRolesUri);
@@ -219,14 +219,14 @@ public class CmsUserAdmin extends AggregatingUserAdmin {
 //		} else {
 //			throw new IllegalArgumentException("Unsupported scheme " + u.getScheme());
 //		}
-		String basePath = userDirectory.getContext();
+		String basePath = userDirectory.getBase();
 
 		addUserDirectory(userDirectory);
 		if (isSystemRolesBaseDn(basePath)) {
 			addStandardSystemRoles();
 		}
 		if (log.isDebugEnabled()) {
-			log.debug("User directory " + userDirectory.getContext() + (u != null ? " [" + u.getScheme() + "]" : "")
+			log.debug("User directory " + userDirectory.getBase() + (u != null ? " [" + u.getScheme() + "]" : "")
 					+ " enabled." + (realm != null ? " " + realm + " realm." : ""));
 		}
 		return userDirectory;