X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FActivator.java;h=11bb9f595b862916b17d121d82a086222284c809;hb=ebd927da42511bb5959000c50a39974c6cfa5f49;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..11bb9f595 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 @@ -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 {