Make CMS startup more asynchronous

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / Activator.java

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 a70235976ee8c34b1ba4d7891b2e1b1a3dc4835c..980dde975fd2424a2ec210240573ebb3406397be 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
@@ -1,6 +1,5 @@
 package org.argeo.cms.internal.kernel;
 
-import java.awt.image.Kernel;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Files;
@@ -29,8 +28,8 @@ import org.osgi.service.log.LogReaderService;
 import org.osgi.service.useradmin.UserAdmin;
 
 /**
- * Activates the {@link Kernel} from the provided {@link BundleContext}. Gives
- * access to kernel information for the rest of the bundle (and only it)
+ * Activates the kernel. Gives access to kernel information for the rest of the
+ * bundle (and only it)
  */
 public class Activator implements BundleActivator {
        private final static Log log = LogFactory.getLog(Activator.class);
@@ -49,6 +48,7 @@ public class Activator implements BundleActivator {
 
        @Override
        public void start(BundleContext bundleContext) throws Exception {
+               Runtime.getRuntime().addShutdownHook(new CmsShutdown());
                instance = this;
                this.bc = bundleContext;
                this.logReaderService = getService(LogReaderService.class);
@@ -59,6 +59,7 @@ public class Activator implements BundleActivator {
                        initSecurity();
                        initArgeoLogger();
                        initNode();
+                       log.debug("Kernel bundle started");
                } catch (Exception e) {
                        log.error("## FATAL: CMS activator failed", e);
                }
@@ -161,9 +162,18 @@ public class Activator implements BundleActivator {
        }
 
        public static GSSCredential getAcceptorCredentials() {
+               return getNodeUserAdmin().getAcceptorCredentials();
+       }
+
+       public static boolean isSingleUser() {
+               return getNodeUserAdmin().isSingleUser();
+       }
+
+       private static NodeUserAdmin getNodeUserAdmin() {
                ServiceReference<UserAdmin> sr = instance.bc.getServiceReference(UserAdmin.class);
                NodeUserAdmin userAdmin = (NodeUserAdmin) instance.bc.getService(sr);
-               return userAdmin.getAcceptorCredentials();
+               return userAdmin;
+
        }
 
        // static CmsSecurity getCmsSecurity() {