X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FActivator.java;h=25746a48116b29f84930e93ea7a18272d1199412;hb=35507e18257f2e9f59842ba5120fcd3f19c4cf4d;hp=e5930303a076ade9b77a4301ceccd0e8f8699b43;hpb=6decc943ce5bca1b57ef407b7e9c6bb6ad6f3c97;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 e5930303a..25746a481 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;
@@ -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);
@@ -61,7 +61,6 @@ public class Activator implements BundleActivator {
 			initNode();
 		} catch (Exception e) {
 			log.error("## FATAL: CMS activator failed", e);
-			// throw new CmsException("Cannot initialize node", e);
 		}
 	}
 
@@ -69,13 +68,40 @@ public class Activator implements BundleActivator {
 		if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) {
 			String jaasConfig = KernelConstants.JAAS_CONFIG;
 			URL url = getClass().getClassLoader().getResource(jaasConfig);
-			System.setProperty(KernelConstants.JAAS_CONFIG_PROP, url.toExternalForm());
+			// System.setProperty(KernelConstants.JAAS_CONFIG_PROP,
+			// url.toExternalForm());
+			KernelUtils.setJaasConfiguration(url);
 		}
 		// explicitly load JAAS configuration
 		Configuration.getConfiguration();
+
+		// ConditionalPermissionAdmin permissionAdmin = bc
+		// .getService(bc.getServiceReference(ConditionalPermissionAdmin.class));
+		// ConditionalPermissionUpdate update =
+		// permissionAdmin.newConditionalPermissionUpdate();
+		// // Self
+		// update.getConditionalPermissionInfos()
+		// .add(permissionAdmin.newConditionalPermissionInfo(null,
+		// new ConditionInfo[] {
+		// new ConditionInfo(BundleLocationCondition.class.getName(), new
+		// String[] { "*" }) },
+		// new PermissionInfo[] { new
+		// PermissionInfo(AllPermission.class.getName(), null, null) },
+		// ConditionalPermissionInfo.ALLOW));
+		//
 	}
 
 	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);
 	}
@@ -106,14 +132,21 @@ public class Activator implements BundleActivator {
 
 	@Override
 	public void stop(BundleContext bundleContext) throws Exception {
-		nodeInstance.shutdown();
-		nodeDeployment.shutdown();
-		nodeState.shutdown();
-
-		instance = null;
-		this.bc = null;
-		this.logReaderService = null;
-		// this.configurationAdmin = null;
+		try {
+			if (nodeInstance != null)
+				nodeInstance.shutdown();
+			if (nodeDeployment != null)
+				nodeDeployment.shutdown();
+			if (nodeState != null)
+				nodeState.shutdown();
+
+			instance = null;
+			this.bc = null;
+			this.logReaderService = null;
+			// this.configurationAdmin = null;
+		} catch (Exception e) {
+			log.error("CMS activator shutdown failed", e);
+		}
 	}
 
 	private <T> T getService(Class<T> clazz) {
@@ -128,9 +161,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() {