X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FInitUtils.java;h=a2006a7049e306018c57902fb86c636e417fc904;hb=549ff25baf9371d910065303e22daf49321b517a;hp=3c40a389b44b73689f22ef5039471df0ff83e889;hpb=a1e5c8447beec2b896b0a03e38a4c17608a4b85d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/InitUtils.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/InitUtils.java
index 3c40a389b..a2006a704 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/InitUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/InitUtils.java
@@ -8,7 +8,6 @@ import java.io.IOException;
 import java.io.Reader;
 import java.net.InetAddress;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -16,35 +15,23 @@ import java.security.KeyStore;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Dictionary;
-import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
-import java.util.Map;
 
-import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
-import javax.jcr.RepositoryFactory;
 import javax.security.auth.x500.X500Principal;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsConstants;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.internal.http.InternalHttpConstants;
-import org.argeo.cms.internal.jcr.RepoConf;
-import org.argeo.jackrabbit.client.ClientDavexRepositoryFactory;
-import org.argeo.jcr.JcrException;
-import org.argeo.naming.LdapAttrs;
 import org.argeo.osgi.useradmin.UserAdminConf;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
 
 /**
  * Interprets framework properties in order to generate the initial deploy
  * configuration.
  */
 class InitUtils {
-	private final static Log log = LogFactory.getLog(InitUtils.class);
+	private final static CmsLog log = CmsLog.getLog(InitUtils.class);
 
 
 	/** Override the provided config with the framework properties */
@@ -130,7 +117,7 @@ class InitUtils {
 			if (webSocketEnabled != null && webSocketEnabled.equals("true"))
 				props.put(InternalHttpConstants.WEBSOCKET_ENABLED, true);
 
-			props.put(NodeConstants.CN, NodeConstants.DEFAULT);
+			props.put(CmsConstants.CN, CmsConstants.DEFAULT);
 		}
 		return props;
 	}
@@ -141,8 +128,8 @@ class InitUtils {
 		List<String> uris = new ArrayList<>();
 
 		// node roles
-		String nodeRolesUri = getFrameworkProp(NodeConstants.ROLES_URI);
-		String baseNodeRoleDn = NodeConstants.ROLES_BASEDN;
+		String nodeRolesUri = getFrameworkProp(CmsConstants.ROLES_URI);
+		String baseNodeRoleDn = CmsConstants.ROLES_BASEDN;
 		if (nodeRolesUri == null) {
 			nodeRolesUri = baseNodeRoleDn + ".ldif";
 			File nodeRolesFile = new File(nodeBaseDir, nodeRolesUri);
@@ -158,8 +145,8 @@ class InitUtils {
 		uris.add(nodeRolesUri);
 
 		// node tokens
-		String nodeTokensUri = getFrameworkProp(NodeConstants.TOKENS_URI);
-		String baseNodeTokensDn = NodeConstants.TOKENS_BASEDN;
+		String nodeTokensUri = getFrameworkProp(CmsConstants.TOKENS_URI);
+		String baseNodeTokensDn = CmsConstants.TOKENS_BASEDN;
 		if (nodeTokensUri == null) {
 			nodeTokensUri = baseNodeTokensDn + ".ldif";
 			File nodeTokensFile = new File(nodeBaseDir, nodeTokensUri);
@@ -175,7 +162,7 @@ class InitUtils {
 		uris.add(nodeTokensUri);
 
 		// Business roles
-		String userAdminUris = getFrameworkProp(NodeConstants.USERADMIN_URIS);
+		String userAdminUris = getFrameworkProp(CmsConstants.USERADMIN_URIS);
 		if (userAdminUris == null) {
 			String demoBaseDn = "dc=example,dc=com";
 			userAdminUris = demoBaseDn + ".ldif";
@@ -232,7 +219,7 @@ class InitUtils {
 	 * some files (typically LDIF, etc).
 	 */
 	static void prepareFirstInitInstanceArea() {
-		String nodeInits = getFrameworkProp(NodeConstants.NODE_INIT);
+		String nodeInits = getFrameworkProp(CmsConstants.NODE_INIT);
 		if (nodeInits == null)
 			nodeInits = "../../init";