X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FFirstInitProperties.java;h=621fe6f14e3dabfe06f444938148c28945eb00fb;hb=fcae8c8dbe979fbfdad103747328cf60de7d3315;hp=2a054d5be1af1c10c63c1216ddd39b4e0fe792dd;hpb=df8ecf06ff62ff3f31a7cbe7c992e183312563fd;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/FirstInitProperties.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/FirstInitProperties.java index 2a054d5be..621fe6f14 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/FirstInitProperties.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/FirstInitProperties.java @@ -15,10 +15,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; -import org.argeo.cms.auth.AuthConstants; -import org.argeo.jcr.ArgeoJcrConstants; import org.argeo.node.NodeConstants; -import org.argeo.node.RepoConf; import org.argeo.osgi.useradmin.UserAdminConf; import org.eclipse.equinox.http.jetty.JettyConstants; @@ -41,8 +38,8 @@ class FirstInitProperties { if (value != null) props.put(repoConf.name(), value); } - props.put(NodeConstants.CN, ArgeoJcrConstants.ALIAS_NODE); - props.put(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS, ArgeoJcrConstants.ALIAS_NODE); + props.put(NodeConstants.CN, NodeConstants.NODE); +// props.put(NodeConstants.JCR_REPOSITORY_ALIAS, NodeConstants.NODE); return props; } @@ -84,7 +81,7 @@ class FirstInitProperties { // node roles String nodeRolesUri = getFrameworkProp(NodeConstants.ROLES_URI); - String baseNodeRoleDn = AuthConstants.ROLES_BASEDN; + String baseNodeRoleDn = NodeConstants.ROLES_BASEDN; if (nodeRolesUri == null) { File nodeRolesFile = new File(nodeBaseDir, baseNodeRoleDn + ".ldif"); if (!nodeRolesFile.exists())