X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FActivator.java;h=1d40c99463c07e58a35ae59b1b900040acc5f7fb;hb=1339280e5c79d505b283855b9373488380acd29f;hp=5ec9f5087649474b1fc9284a502a8956070412ef;hpb=6ddb7b6b224a00344a182761e42b2241a721224f;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
index 5ec9f5087..1d40c9946 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
@@ -2,6 +2,8 @@ package org.argeo.cms.internal.kernel;
 
 import java.util.UUID;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
@@ -10,19 +12,29 @@ import org.osgi.framework.BundleContext;
  * access to kernel information for the rest of the bundle (and only it)
  */
 public class Activator implements BundleActivator {
-	private final static String systemKey = UUID.randomUUID().toString();
+	public final static String SYSTEM_KEY_PROPERTY = "argeo.security.systemKey";
+	private final Log log = LogFactory.getLog(Activator.class);
+
+	private final static String systemKey;
+	static {
+		systemKey = UUID.randomUUID().toString();
+		System.setProperty(SYSTEM_KEY_PROPERTY, systemKey);
+	}
 
 	private static BundleContext bundleContext;
-	private Kernel kernel;
+	private static Kernel kernel;
 
 	@Override
 	public void start(BundleContext context) throws Exception {
 		assert bundleContext == null;
 		assert kernel == null;
-
 		bundleContext = context;
-		kernel = new Kernel(bundleContext);
-		kernel.init();
+		try {
+			kernel = new Kernel();
+			kernel.init();
+		} catch (Exception e) {
+			log.error("Cannot boot kernel", e);
+		}
 	}
 
 	@Override
@@ -34,18 +46,24 @@ public class Activator implements BundleActivator {
 
 	/**
 	 * Singleton interface to the {@link BundleContext} related to the calling
-	 * thread. Can be used only within the CMS bundle.
+	 * thread.
+	 * 
+	 * @BundleScope
 	 */
 	public static BundleContext getBundleContext() {
 		return bundleContext;
 	}
 
+	public static KernelHeader getKernelHeader() {
+		return kernel;
+	}
+
 	/**
 	 * @return a String which is guaranteed to be unique between and constant
 	 *         within a Java static context (typically a VM launch)
+	 * @BundleScope
 	 */
 	public final static String getSystemKey() {
 		return systemKey;
 	}
-
 }