X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=inline;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FFirstInit.java;h=6175e4d030c79abe9d99d7eaec0561391f1677fa;hb=54e74b900b1c0f7b1de0def771de35e50a8d4071;hp=1c7cb149752a7c30ce6b56da3ad1f9db8da21929;hpb=5b5c2b97eee9edd037e198acadf8b416a973863f;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/FirstInit.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/FirstInit.java
index 1c7cb1497..6175e4d03 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/FirstInit.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/FirstInit.java
@@ -56,8 +56,8 @@ class FirstInit {
 		String httpPort = getFrameworkProp("org.osgi.service.http.port");
 		String httpsPort = getFrameworkProp("org.osgi.service.http.port.secure");
 		/// TODO make it more generic
-		String httpHost = getFrameworkProp(JettyConstants.PROPERTY_PREFIX + '.' + JettyConstants.HTTP_HOST);
-		String httpsHost = getFrameworkProp(JettyConstants.PROPERTY_PREFIX + '.' + JettyConstants.HTTPS_HOST);
+		String httpHost = getFrameworkProp(JettyConstants.PROPERTY_PREFIX + JettyConstants.HTTP_HOST);
+		String httpsHost = getFrameworkProp(JettyConstants.PROPERTY_PREFIX + JettyConstants.HTTPS_HOST);
 
 		final Hashtable<String, Object> props = new Hashtable<String, Object>();
 		// try {
@@ -71,7 +71,7 @@ class FirstInit {
 				props.put(JettyConstants.HTTPS_ENABLED, true);
 				Path keyStorePath = KernelUtils.getOsgiInstancePath(KernelConstants.DEFAULT_KEYSTORE_PATH);
 				String keyStorePassword = getFrameworkProp(
-						JettyConstants.PROPERTY_PREFIX + '.' + JettyConstants.SSL_PASSWORD);
+						JettyConstants.PROPERTY_PREFIX + JettyConstants.SSL_PASSWORD);
 				if (keyStorePassword == null)
 					keyStorePassword = "changeit";
 				if (!Files.exists(keyStorePath))
@@ -100,7 +100,8 @@ class FirstInit {
 		String nodeRolesUri = getFrameworkProp(NodeConstants.ROLES_URI);
 		String baseNodeRoleDn = NodeConstants.ROLES_BASEDN;
 		if (nodeRolesUri == null) {
-			File nodeRolesFile = new File(nodeBaseDir, baseNodeRoleDn + ".ldif");
+			nodeRolesUri = baseNodeRoleDn + ".ldif";
+			File nodeRolesFile = new File(nodeBaseDir, nodeRolesUri);
 			if (!nodeRolesFile.exists())
 				try {
 					FileUtils.copyInputStreamToFile(getClass().getResourceAsStream(baseNodeRoleDn + ".ldif"),
@@ -108,7 +109,7 @@ class FirstInit {
 				} catch (IOException e) {
 					throw new CmsException("Cannot copy demo resource", e);
 				}
-			nodeRolesUri = nodeRolesFile.toURI().toString();
+			// nodeRolesUri = nodeRolesFile.toURI().toString();
 		}
 		uris.add(nodeRolesUri);
 
@@ -116,7 +117,8 @@ class FirstInit {
 		String userAdminUris = getFrameworkProp(NodeConstants.USERADMIN_URIS);
 		if (userAdminUris == null) {
 			String demoBaseDn = "dc=example,dc=com";
-			File businessRolesFile = new File(nodeBaseDir, demoBaseDn + ".ldif");
+			userAdminUris = demoBaseDn + ".ldif";
+			File businessRolesFile = new File(nodeBaseDir, userAdminUris);
 			if (!businessRolesFile.exists())
 				try {
 					FileUtils.copyInputStreamToFile(getClass().getResourceAsStream(demoBaseDn + ".ldif"),
@@ -124,7 +126,7 @@ class FirstInit {
 				} catch (IOException e) {
 					throw new CmsException("Cannot copy demo resource", e);
 				}
-			userAdminUris = businessRolesFile.toURI().toString();
+			// userAdminUris = businessRolesFile.toURI().toString();
 			log.warn("## DEV Using dummy base DN " + demoBaseDn);
 			// TODO downgrade security level
 		}
@@ -142,11 +144,11 @@ class FirstInit {
 					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);
+						// u = KernelUtils.getOsgiInstanceUri(KernelConstants.DIR_NODE + '/' + uri);
+						u = new URI(uri);
 					} else
 						throw new CmsException("Cannot interpret " + uri + " as an uri");
-				} else if (u.getScheme().equals("file")) {
+				} else if (u.getScheme().equals(UserAdminConf.SCHEME_FILE)) {
 					u = new File(u).getCanonicalFile().toURI();
 				}
 			} catch (Exception e) {