X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FKernelUtils.java;h=0e84af62af45d8c5b2d22b0261cb3e1dcc2170b9;hb=94acaccee3d04f3b91f36d2b78ebae76bcd996de;hp=afcb9ff26a77d68502373e86a5eb2fd84280fa3d;hpb=f4da6777015da3fc392138f0c01cea2f2add9ed3;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelUtils.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelUtils.java
index afcb9ff26..0e84af62a 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelUtils.java
@@ -19,7 +19,7 @@ import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.internal.osgi.CmsActivator;
 
 /** Package utilities */
-public class KernelUtils implements KernelConstants {
+class KernelUtils implements KernelConstants {
 	final static String OSGI_INSTANCE_AREA = "osgi.instance.area";
 	final static String OSGI_CONFIGURATION_AREA = "osgi.configuration.area";
 
@@ -63,10 +63,10 @@ public class KernelUtils implements KernelConstants {
 		}
 	}
 
-	static File getOsgiInstanceDir() {
-		return new File(CmsActivator.getBundleContext().getProperty(OSGI_INSTANCE_AREA).substring("file:".length()))
-				.getAbsoluteFile();
-	}
+//	static File getOsgiInstanceDir() {
+//		return new File(CmsActivator.getBundleContext().getProperty(OSGI_INSTANCE_AREA).substring("file:".length()))
+//				.getAbsoluteFile();
+//	}
 
 	public static Path getOsgiInstancePath(String relativePath) {
 		return Paths.get(getOsgiInstanceUri(relativePath));
@@ -74,15 +74,18 @@ public class KernelUtils implements KernelConstants {
 
 	public static URI getOsgiInstanceUri(String relativePath) {
 		String osgiInstanceBaseUri = getFrameworkProp(OSGI_INSTANCE_AREA);
+		if (!osgiInstanceBaseUri.endsWith("/"))
+			osgiInstanceBaseUri = osgiInstanceBaseUri + "/";
 		if (osgiInstanceBaseUri != null)
 			return safeUri(osgiInstanceBaseUri + (relativePath != null ? relativePath : ""));
 		else
-			return Paths.get(System.getProperty("user.dir")).toUri();
+			return Paths.get(System.getProperty("user.dir"), (relativePath != null ? relativePath : "")).toUri();
 	}
 
 	static File getOsgiConfigurationFile(String relativePath) {
 		try {
-			return new File(new URI(CmsActivator.getBundleContext().getProperty(OSGI_CONFIGURATION_AREA) + relativePath))
+			return new File(
+					new URI(CmsActivator.getBundleContext().getProperty(OSGI_CONFIGURATION_AREA) + relativePath))
 					.getCanonicalFile();
 		} catch (Exception e) {
 			throw new IllegalArgumentException("Cannot get configuration file for " + relativePath, e);
@@ -100,7 +103,7 @@ public class KernelUtils implements KernelConstants {
 		return value;
 	}
 
-	public static String getFrameworkProp(String key) {
+	static String getFrameworkProp(String key) {
 		return getFrameworkProp(key, null);
 	}