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=b9c3e8ba3e9d74c0fedb66a06a12148fd3fcd4cb;hp=6b34c207ccfc12482178a024b0b6985ca2920793;hpb=a7970d75a320e1702ff62392242499e7c2527ba3;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 6b34c207c..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
@@ -5,16 +5,18 @@ import static org.argeo.cms.internal.kernel.KernelUtils.getFrameworkProp;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
 import java.util.Dictionary;
 import java.util.Hashtable;
+import java.util.List;
 
 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.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;
 
 /**
@@ -36,11 +38,12 @@ 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;
 	}
 
+	/** Override the provided config with the framework properties */
 	Dictionary<String, Object> getHttpServerConfig(Dictionary<String, Object> provided) {
 		String httpPort = getFrameworkProp("org.osgi.service.http.port");
 		String httpsPort = getFrameworkProp("org.osgi.service.http.port.secure");
@@ -66,11 +69,77 @@ class FirstInitProperties {
 			if (httpHost != null) {
 				props.put(JettyConstants.HTTP_HOST, httpHost);
 			}
-			props.put(NodeConstants.CN, "default");
+			props.put(NodeConstants.CN, NodeConstants.DEFAULT);
 		}
 		return props;
 	}
 
+	List<Dictionary<String, Object>> getUserDirectoryConfigs() {
+		List<Dictionary<String, Object>> res = new ArrayList<>();
+		File nodeBaseDir = KernelUtils.getOsgiInstancePath(KernelConstants.DIR_NODE).toFile();
+		List<String> uris = new ArrayList<>();
+
+		// node roles
+		String nodeRolesUri = getFrameworkProp(NodeConstants.ROLES_URI);
+		String baseNodeRoleDn = NodeConstants.ROLES_BASEDN;
+		if (nodeRolesUri == null) {
+			File nodeRolesFile = new File(nodeBaseDir, baseNodeRoleDn + ".ldif");
+			if (!nodeRolesFile.exists())
+				try {
+					FileUtils.copyInputStreamToFile(getClass().getResourceAsStream(baseNodeRoleDn + ".ldif"),
+							nodeRolesFile);
+				} catch (IOException e) {
+					throw new CmsException("Cannot copy demo resource", e);
+				}
+			nodeRolesUri = nodeRolesFile.toURI().toString();
+		}
+		uris.add(nodeRolesUri);
+
+		// Business roles
+		String userAdminUris = getFrameworkProp(NodeConstants.USERADMIN_URIS);
+		if (userAdminUris == null) {
+			String demoBaseDn = "dc=example,dc=com";
+			File businessRolesFile = new File(nodeBaseDir, demoBaseDn + ".ldif");
+			if (!businessRolesFile.exists())
+				try {
+					FileUtils.copyInputStreamToFile(getClass().getResourceAsStream(demoBaseDn + ".ldif"),
+							businessRolesFile);
+				} catch (IOException e) {
+					throw new CmsException("Cannot copy demo resource", e);
+				}
+			userAdminUris = businessRolesFile.toURI().toString();
+		}
+		for (String userAdminUri : userAdminUris.split(" "))
+			uris.add(userAdminUri);
+
+		// Interprets URIs
+		for (String uri : uris) {
+			URI u;
+			try {
+				u = new URI(uri);
+				if (u.getPath() == null)
+					throw new CmsException("URI " + uri + " must have a path in order to determine base DN");
+				if (u.getScheme() == null) {
+					if (uri.startsWith("/") || uri.startsWith("./") || uri.startsWith("../"))
+						u = new File(uri).getCanonicalFile().toURI();
+					else if (!uri.contains("/")) {
+						u = KernelUtils.getOsgiInstanceUri(KernelConstants.DIR_NODE + '/' + uri);
+						// u = new URI(nodeBaseDir.toURI() + uri);
+					} else
+						throw new CmsException("Cannot interpret " + uri + " as an uri");
+				} else if (u.getScheme().equals("file")) {
+					u = new File(u).getCanonicalFile().toURI();
+				}
+			} catch (Exception e) {
+				throw new CmsException("Cannot interpret " + uri + " as an uri", e);
+			}
+			Dictionary<String, Object> properties = UserAdminConf.uriAsProperties(u.toString());
+			res.add(properties);
+		}
+
+		return res;
+	}
+
 	/**
 	 * Called before node initialisation, in order populate OSGi instance are
 	 * with some files (typically LDIF, etc).