Use OSGi framework UUID as CMS State UUID

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / runtime / KernelUtils.java

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 6e47873b35557f772ac7d702433652bdb342a3fa..3797eb913ca05544d5f7c6042d89f2c7227c35a1 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelUtils.java
@@ -22,6 +22,8 @@ class KernelUtils implements KernelConstants {
        final static String OSGI_INSTANCE_AREA = "osgi.instance.area";
        final static String OSGI_CONFIGURATION_AREA = "osgi.configuration.area";
 
+       final static String OSGI_FRAMEWORK_UUID = "org.osgi.framework.uuid";
+
        static void setJaasConfiguration(URL jaasConfigurationUrl) {
                try {
                        URIParameter uriParameter = new URIParameter(jaasConfigurationUrl.toURI());
@@ -65,6 +67,13 @@ class KernelUtils implements KernelConstants {
                return Paths.get(uri);
        }
 
+       public static Path getOsgiConfigurationPath(String relativePath) {
+               URI uri = getOsgiConfigurationUri(relativePath);
+               if (uri == null) // no data area available
+                       return null;
+               return Paths.get(uri);
+       }
+
        public static URI getOsgiInstanceUri(String relativePath) {
                String osgiInstanceBaseUri = getFrameworkProp(OSGI_INSTANCE_AREA);
                if (osgiInstanceBaseUri == null) // no data area available
@@ -75,6 +84,16 @@ class KernelUtils implements KernelConstants {
                return safeUri(osgiInstanceBaseUri + (relativePath != null ? relativePath : ""));
        }
 
+       public static URI getOsgiConfigurationUri(String relativePath) {
+               String osgiInstanceBaseUri = getFrameworkProp(OSGI_CONFIGURATION_AREA);
+               if (osgiInstanceBaseUri == null) // no data area available
+                       return null;
+
+               if (!osgiInstanceBaseUri.endsWith("/"))
+                       osgiInstanceBaseUri = osgiInstanceBaseUri + "/";
+               return safeUri(osgiInstanceBaseUri + (relativePath != null ? relativePath : ""));
+       }
+
        static String getFrameworkProp(String key, String def) {
                String value;
                if (CmsActivator.getBundleContext() != null)
@@ -121,6 +140,7 @@ class KernelUtils implements KernelConstants {
                if (uri == null)
                        throw new IllegalArgumentException("URI cannot be null");
                try {
+                       // FIXME does not work if URI contains illegal characters (such as spaces, etc.)
                        return new URI(uri);
                } catch (URISyntaxException e) {
                        throw new IllegalArgumentException("Badly formatted URI " + uri, e);