Adapt after Argeo Suite refactoring.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / osgi / CmsActivator.java

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 d28ffdbb225e937e26b904e2bbdc5da788d7017d..038d7029ca9cf6b720c1b8c01ef85e95384c32aa 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java
@@ -35,7 +35,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 +55,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 +90,8 @@ public class CmsActivator implements BundleActivator {
                } catch (Exception e) {
                        log.error("CMS activator shutdown failed", e);
                }
+               
+               new GogoShellKiller().start();
        }
 
        private void initSecurity() {
@@ -128,7 +131,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);
        }