X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FActivator.java;h=01e842caa6043326223fe9be65c666975bf4a6c8;hb=44990a14a843b1eac4c0dfca228559c9e86c256b;hp=1efc9dc66474953221194974c0044558e163514b;hpb=5b5c2b97eee9edd037e198acadf8b416a973863f;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 1efc9dc66..01e842caa 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
@@ -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;
@@ -27,10 +26,11 @@ import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.log.LogReaderService;
 import org.osgi.service.useradmin.UserAdmin;
+import org.osgi.util.tracker.ServiceTracker;
 
 /**
- * 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);
@@ -38,29 +38,32 @@ public class Activator implements BundleActivator {
 	private static Activator instance;
 
 	private BundleContext bc;
-	// private CmsSecurity nodeSecurity;
+
 	private LogReaderService logReaderService;
-	// private ConfigurationAdmin configurationAdmin;
 
 	private NodeLogger logger;
 	private CmsState nodeState;
 	private CmsDeployment nodeDeployment;
 	private CmsInstance nodeInstance;
 
+	private ServiceTracker<UserAdmin, NodeUserAdmin> userAdminSt;
+
 	@Override
 	public void start(BundleContext bundleContext) throws Exception {
 		Runtime.getRuntime().addShutdownHook(new CmsShutdown());
 		instance = this;
 		this.bc = bundleContext;
 		this.logReaderService = getService(LogReaderService.class);
-		// this.configurationAdmin = getService(ConfigurationAdmin.class);
 
 		try {
-			// nodeSecurity = new CmsSecurity();
 			initSecurity();
 			initArgeoLogger();
 			initNode();
-		} catch (Exception e) {
+
+			userAdminSt = new ServiceTracker<>(instance.bc, UserAdmin.class, null);
+			userAdminSt.open();
+			log.debug("Kernel bundle started");
+		} catch (Throwable e) {
 			log.error("## FATAL: CMS activator failed", e);
 		}
 	}
@@ -93,16 +96,6 @@ public class Activator implements BundleActivator {
 	}
 
 	private void initArgeoLogger() {
-		// Jetty
-		// disable integration of Jetty logging with SLF4J
-		// in order to avoid chicken and egg problems
-		// org.eclipse.jetty.util.log.Log.setLog(new StdErrLog());
-		// org.eclipse.jetty.util.log.Logger jettyLog =
-		// org.eclipse.jetty.util.log.Log.getLog();
-		// if (jettyLog != null) {
-		// jettyLog.warn("TEST JETTY LOG", new Object[0]);
-		// }
-
 		logger = new NodeLogger(logReaderService);
 		bc.registerService(ArgeoLogger.class, logger, null);
 	}
@@ -141,6 +134,9 @@ public class Activator implements BundleActivator {
 			if (nodeState != null)
 				nodeState.shutdown();
 
+			if (userAdminSt != null)
+				userAdminSt.close();
+
 			instance = null;
 			this.bc = null;
 			this.logReaderService = null;
@@ -162,9 +158,33 @@ public class Activator implements BundleActivator {
 	}
 
 	public static GSSCredential getAcceptorCredentials() {
-		ServiceReference<UserAdmin> sr = instance.bc.getServiceReference(UserAdmin.class);
-		NodeUserAdmin userAdmin = (NodeUserAdmin) instance.bc.getService(sr);
-		return userAdmin.getAcceptorCredentials();
+		return getNodeUserAdmin().getAcceptorCredentials();
+	}
+
+	public static boolean isSingleUser() {
+		return getNodeUserAdmin().isSingleUser();
+	}
+
+	public static UserAdmin getUserAdmin() {
+		return (UserAdmin) getNodeUserAdmin();
+	}
+
+	private static NodeUserAdmin getNodeUserAdmin() {
+		NodeUserAdmin res;
+		try {
+			res = instance.userAdminSt.waitForService(60000);
+		} catch (InterruptedException e) {
+			throw new CmsException("Cannot retrieve Node user admin", e);
+		}
+		if (res == null)
+			throw new CmsException("No Node user admin found");
+
+		return res;
+		// ServiceReference<UserAdmin> sr =
+		// instance.bc.getServiceReference(UserAdmin.class);
+		// NodeUserAdmin userAdmin = (NodeUserAdmin) instance.bc.getService(sr);
+		// return userAdmin;
+
 	}
 
 	// static CmsSecurity getCmsSecurity() {