X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FActivator.java;h=5ba7c01e8bc18864b9aeba4f40de56ea7c263985;hb=7247dd170e85ec1fcc80f207d0bef173af393443;hp=e7dcfc1a2ddbe7c2a95cd5c71865c881710dd1ad;hpb=4a9b0e61d44c296d131b774c4b5c52d528c523bd;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 e7dcfc1a2..5ba7c01e8 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
@@ -37,9 +37,7 @@ 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;
@@ -52,14 +50,13 @@ public class Activator implements BundleActivator {
 		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) {
+			log.debug("Kernel bundle started");
+		} catch (Throwable e) {
 			log.error("## FATAL: CMS activator failed", e);
 		}
 	}
@@ -92,16 +89,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);
 	}
@@ -161,9 +148,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() {