X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=83f21202e45612855b87d23d29a226479469df3a;hb=08fac35eeedb151c2fd1cc85ed4a36adf66e02fc;hp=c63184a2435d189f314ebc57319dfabb4469b11b;hpb=35904a4a72fe8a4908c345f73856711c7b4c472c;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java index c63184a24..83f21202e 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java @@ -1,6 +1,7 @@ package org.argeo.cms.internal.kernel; import java.lang.management.ManagementFactory; +import java.net.URL; import java.util.HashMap; import java.util.Map; @@ -39,12 +40,19 @@ final class Kernel implements ServiceListener { private final BundleContext bundleContext = Activator.getBundleContext(); - private JackrabbitNode node; - private OsgiJackrabbitRepositoryFactory repositoryFactory; - private NodeSecurity nodeSecurity; - private NodeHttp nodeHttp; + ThreadGroup threadGroup = new ThreadGroup(Kernel.class.getSimpleName()); + JackrabbitNode node; + OsgiJackrabbitRepositoryFactory repositoryFactory; + NodeSecurity nodeSecurity; + NodeHttp nodeHttp; + private KernelThread kernelThread; void init() { + URL url = getClass().getClassLoader().getResource( + KernelConstants.JAAS_CONFIG); + System.setProperty("java.security.auth.login.config", + url.toExternalForm()); + ClassLoader currentContextCl = Thread.currentThread() .getContextClassLoader(); Thread.currentThread().setContextClassLoader( @@ -68,6 +76,11 @@ final class Kernel implements ServiceListener { ExtendedHttpService httpService = waitForHttpService(); nodeHttp = new NodeHttp(httpService, node, nodeSecurity); + // Kernel thread + kernelThread = new KernelThread(this); + kernelThread.setContextClassLoader(Kernel.class.getClassLoader()); + kernelThread.start(); + // Publish services to OSGi nodeSecurity.publish(); node.publish(repositoryFactory); @@ -94,6 +107,8 @@ final class Kernel implements ServiceListener { void destroy() { long begin = System.currentTimeMillis(); + kernelThread.destroyAndJoin(); + if (nodeHttp != null) nodeHttp.destroy(); if (nodeSecurity != null)