Introduce node runner

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / Activator.java

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 e5930303a076ade9b77a4301ceccd0e8f8699b43..11bb9f595b862916b17d121d82a086222284c809 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
@@ -42,7 +42,7 @@ 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;
@@ -69,15 +69,17 @@ 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();
        }
 
        private void initArgeoLogger() {
-               logger = new NodeLogger(logReaderService);
-               bc.registerService(ArgeoLogger.class, logger, null);
+//             logger = new NodeLogger(logReaderService);
+//             bc.registerService(ArgeoLogger.class, logger, null);
        }
 
        private void initNode() throws IOException {