X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fosgi%2FCmsActivator.java;h=d4b2f4595a8b400b0cadf5c8383c80614b0a1dcb;hb=0d10cb454d6c3c98e671dafc11600c884dce8d75;hp=d28ffdbb225e937e26b904e2bbdc5da788d7017d;hpb=f4da6777015da3fc392138f0c01cea2f2add9ed3;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java b/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java
index d28ffdbb2..d4b2f4595 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java
@@ -8,16 +8,13 @@ import org.argeo.cms.ArgeoLogger;
 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.http.HttpService;
 import org.osgi.service.log.LogReaderService;
 import org.osgi.service.permissionadmin.PermissionInfo;
-import org.osgi.util.tracker.ServiceTracker;
 
 /**
  * Activates the kernel. Gives access to kernel information for the rest of the
@@ -35,7 +32,7 @@ public class CmsActivator implements BundleActivator {
 
 	private LogReaderService logReaderService;
 
-	private NodeLogger logger;
+	private CmsOsgiLogger logger;
 //	private CmsStateImpl nodeState;
 //	private CmsDeploymentImpl nodeDeployment;
 //	private CmsContextImpl nodeInstance;
@@ -55,6 +52,7 @@ public class CmsActivator implements BundleActivator {
 //		this.bc = bundleContext;
 		if (bundleContext != null)
 			this.logReaderService = getService(LogReaderService.class);
+		initArgeoLogger();
 //		this.internalExecutorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
 //
 //		try {
@@ -89,6 +87,8 @@ public class CmsActivator implements BundleActivator {
 		} catch (Exception e) {
 			log.error("CMS activator shutdown failed", e);
 		}
+		
+		new GogoShellKiller().start();
 	}
 
 	private void initSecurity() {
@@ -128,7 +128,7 @@ public class CmsActivator implements BundleActivator {
 	}
 
 	private void initArgeoLogger() {
-		logger = new NodeLogger(logReaderService);
+		logger = new CmsOsgiLogger(logReaderService);
 		if (bundleContext != null)
 			bundleContext.registerService(ArgeoLogger.class, logger, null);
 	}
@@ -176,18 +176,18 @@ public class CmsActivator implements BundleActivator {
 //		userAdminSt = new ServiceTracker<>(bundleContext, UserAdmin.class, null);
 //		userAdminSt.open();
 
-		ServiceTracker<?, ?> httpSt = new ServiceTracker<HttpService, HttpService>(bc, HttpService.class, null) {
-
-			@Override
-			public HttpService addingService(ServiceReference<HttpService> sr) {
-				Object httpPort = sr.getProperty("http.port");
-				Object httpsPort = sr.getProperty("https.port");
-				log.info(httpPortsMsg(httpPort, httpsPort));
-				close();
-				return super.addingService(sr);
-			}
-		};
-		httpSt.open();
+//		ServiceTracker<?, ?> httpSt = new ServiceTracker<HttpService, HttpService>(bc, HttpService.class, null) {
+//
+//			@Override
+//			public HttpService addingService(ServiceReference<HttpService> sr) {
+//				Object httpPort = sr.getProperty("http.port");
+//				Object httpsPort = sr.getProperty("https.port");
+//				log.info(httpPortsMsg(httpPort, httpsPort));
+//				close();
+//				return super.addingService(sr);
+//			}
+//		};
+//		httpSt.open();
 	}
 
 	private String httpPortsMsg(Object httpPort, Object httpsPort) {