X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FActivator.java;h=1efc9dc66474953221194974c0044558e163514b;hb=ba925395720fb9a47e222d53d9b5f091e84ddb68;hp=f6a9b146968d8a7981a37d710fef07e02fc37804;hpb=44728c14306ddf25bb5225496de5f44345fab85d;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 f6a9b1469..1efc9dc66 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
@@ -5,7 +5,6 @@ import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.security.AllPermission;
 import java.util.Dictionary;
 import java.util.List;
 import java.util.Locale;
@@ -15,6 +14,7 @@ import javax.security.auth.login.Configuration;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
+import org.argeo.node.ArgeoLogger;
 import org.argeo.node.NodeConstants;
 import org.argeo.node.NodeDeployment;
 import org.argeo.node.NodeInstance;
@@ -25,13 +25,7 @@ import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
-import org.osgi.service.condpermadmin.BundleLocationCondition;
-import org.osgi.service.condpermadmin.ConditionInfo;
-import org.osgi.service.condpermadmin.ConditionalPermissionAdmin;
-import org.osgi.service.condpermadmin.ConditionalPermissionInfo;
-import org.osgi.service.condpermadmin.ConditionalPermissionUpdate;
 import org.osgi.service.log.LogReaderService;
-import org.osgi.service.permissionadmin.PermissionInfo;
 import org.osgi.service.useradmin.UserAdmin;
 
 /**
@@ -48,13 +42,14 @@ public class Activator implements BundleActivator {
 	private LogReaderService logReaderService;
 	// private ConfigurationAdmin configurationAdmin;
 
-	// private NodeLogger logger;
+	private NodeLogger logger;
 	private CmsState nodeState;
 	private CmsDeployment nodeDeployment;
 	private CmsInstance nodeInstance;
 
 	@Override
 	public void start(BundleContext bundleContext) throws Exception {
+		Runtime.getRuntime().addShutdownHook(new CmsShutdown());
 		instance = this;
 		this.bc = bundleContext;
 		this.logReaderService = getService(LogReaderService.class);
@@ -67,7 +62,6 @@ public class Activator implements BundleActivator {
 			initNode();
 		} catch (Exception e) {
 			log.error("## FATAL: CMS activator failed", e);
-			// throw new CmsException("Cannot initialize node", e);
 		}
 	}
 
@@ -82,22 +76,35 @@ public class Activator implements BundleActivator {
 		// 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));
-
+		// 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() {
-		// logger = new NodeLogger(logReaderService);
-		// bc.registerService(ArgeoLogger.class, logger, null);
+		// 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);
 	}
 
 	private void initNode() throws IOException {
@@ -126,14 +133,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) {