X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=cb47a11b36368f37361b8624053420e90a0b8e7b;hb=fd1721107a6c9385fb11f7252f555389fec8667c;hp=af4f0ff2a75cd868d7597f42f35b63d0d9a8c9ae;hpb=51be851d1253d4858f9b63c533df6bcfe76a393f;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 af4f0ff2a..cb47a11b3 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,27 +1,33 @@ package org.argeo.cms.internal.kernel; import java.lang.management.ManagementFactory; +import java.security.PrivilegedAction; import java.util.HashMap; import java.util.Map; +import java.util.Properties; import javax.jcr.Repository; import javax.jcr.RepositoryFactory; +import javax.security.auth.Subject; +import javax.transaction.TransactionManager; +import javax.transaction.TransactionSynchronizationRegistry; +import javax.transaction.UserTransaction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.util.TransientFileFactory; import org.argeo.ArgeoException; import org.argeo.cms.CmsException; +import org.argeo.cms.internal.transaction.SimpleTransactionManager; import org.argeo.jackrabbit.OsgiJackrabbitRepositoryFactory; import org.argeo.jcr.ArgeoJcrConstants; -import org.argeo.security.core.InternalAuthentication; import org.eclipse.equinox.http.servlet.ExtendedHttpService; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceEvent; import org.osgi.framework.ServiceListener; import org.osgi.framework.ServiceReference; +import org.osgi.service.http.HttpService; import org.osgi.util.tracker.ServiceTracker; -import org.springframework.security.core.context.SecurityContextHolder; /** * Argeo CMS Kernel. Responsible for : @@ -38,25 +44,44 @@ final class Kernel implements ServiceListener { private final static Log log = LogFactory.getLog(Kernel.class); private final BundleContext bundleContext = Activator.getBundleContext(); + private final NodeSecurity nodeSecurity; ThreadGroup threadGroup = new ThreadGroup(Kernel.class.getSimpleName()); JackrabbitNode node; - OsgiJackrabbitRepositoryFactory repositoryFactory; - NodeSecurity nodeSecurity; - NodeHttp nodeHttp; + + private SimpleTransactionManager transactionManager; + private OsgiJackrabbitRepositoryFactory repositoryFactory; + private NodeHttp nodeHttp; private KernelThread kernelThread; - void init() { + public Kernel() { + nodeSecurity = new NodeSecurity(bundleContext); + } + + final void init() { + Subject.doAs(nodeSecurity.getKernelSubject(), + new PrivilegedAction() { + + @Override + public Void run() { + doInit(); + return null; + } + + }); + } + + private void doInit() { ClassLoader currentContextCl = Thread.currentThread() .getContextClassLoader(); Thread.currentThread().setContextClassLoader( Kernel.class.getClassLoader()); long begin = System.currentTimeMillis(); - InternalAuthentication initAuth = new InternalAuthentication( - KernelConstants.DEFAULT_SECURITY_KEY); - SecurityContextHolder.getContext().setAuthentication(initAuth); try { + // Transaction + transactionManager = new SimpleTransactionManager(); + // Jackrabbit node node = new JackrabbitNode(bundleContext); @@ -64,11 +89,16 @@ final class Kernel implements ServiceListener { repositoryFactory = new OsgiJackrabbitRepositoryFactory(); // Authentication - nodeSecurity = new NodeSecurity(bundleContext, node); + nodeSecurity.getUserAdmin().setTransactionManager( + transactionManager); // Equinox dependency - ExtendedHttpService httpService = waitForHttpService(); - nodeHttp = new NodeHttp(httpService, node, nodeSecurity); + // ExtendedHttpService httpService = waitForHttpService(); + // nodeHttp = new NodeHttp(httpService, node); + ServiceReference sr = bundleContext + .getServiceReference(ExtendedHttpService.class); + if (sr != null) + addHttpService(sr); // Kernel thread kernelThread = new KernelThread(this); @@ -76,6 +106,14 @@ final class Kernel implements ServiceListener { kernelThread.start(); // Publish services to OSGi + bundleContext.registerService(TransactionManager.class, + transactionManager, null); + bundleContext.registerService(UserTransaction.class, + transactionManager, null); + bundleContext.registerService( + TransactionSynchronizationRegistry.class, + transactionManager.getTransactionSynchronizationRegistry(), + null); nodeSecurity.publish(); node.publish(repositoryFactory); bundleContext.registerService(RepositoryFactory.class, @@ -105,8 +143,8 @@ final class Kernel implements ServiceListener { if (nodeHttp != null) nodeHttp.destroy(); - if (nodeSecurity != null) - nodeSecurity.destroy(); + // if (nodeSecurity != null) + // nodeSecurity.destroy(); if (node != null) node.destroy(); @@ -115,6 +153,10 @@ final class Kernel implements ServiceListener { // Clean hanging threads from Jackrabbit TransientFileFactory.shutdown(); + // Clean hanging Gogo shell thread + new GogoShellKiller().start(); + + nodeSecurity.destroy(); long duration = System.currentTimeMillis() - begin; log.info("## ARGEO CMS DOWN in " + (duration / 1000) + "." + (duration % 1000) + "s ##"); @@ -123,28 +165,52 @@ final class Kernel implements ServiceListener { @Override public void serviceChanged(ServiceEvent event) { ServiceReference sr = event.getServiceReference(); - Object jcrRepoAlias = sr - .getProperty(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS); - if (jcrRepoAlias != null) {// JCR repository - String alias = jcrRepoAlias.toString(); - Repository repository = (Repository) bundleContext.getService(sr); - Map props = new HashMap(); - for (String key : sr.getPropertyKeys()) - props.put(key, sr.getProperty(key)); - if (ServiceEvent.REGISTERED == event.getType()) { - try { - repositoryFactory.register(repository, props); - nodeHttp.registerRepositoryServlets(alias, repository); - } catch (Exception e) { - throw new CmsException("Could not publish JCR repository " - + alias, e); + Object service = bundleContext.getService(sr); + if (service instanceof Repository) { + Object jcrRepoAlias = sr + .getProperty(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS); + if (jcrRepoAlias != null) {// JCR repository + String alias = jcrRepoAlias.toString(); + Repository repository = (Repository) bundleContext + .getService(sr); + Map props = new HashMap(); + for (String key : sr.getPropertyKeys()) + props.put(key, sr.getProperty(key)); + if (ServiceEvent.REGISTERED == event.getType()) { + try { + repositoryFactory.register(repository, props); + nodeHttp.registerRepositoryServlets(alias, repository); + } catch (Exception e) { + throw new CmsException( + "Could not publish JCR repository " + alias, e); + } + } else if (ServiceEvent.UNREGISTERING == event.getType()) { + repositoryFactory.unregister(repository, props); + nodeHttp.unregisterRepositoryServlets(alias); } + } + } else if (service instanceof ExtendedHttpService) { + if (ServiceEvent.REGISTERED == event.getType()) { + addHttpService(sr); } else if (ServiceEvent.UNREGISTERING == event.getType()) { - repositoryFactory.unregister(repository, props); - nodeHttp.unregisterRepositoryServlets(alias); + nodeHttp.destroy(); + nodeHttp = null; } } + } + private void addHttpService(ServiceReference sr) { +// for (String key : sr.getPropertyKeys()) +// log.debug(key + "=" + sr.getProperty(key)); + ExtendedHttpService httpService = (ExtendedHttpService) bundleContext + .getService(sr); + // TODO find constants + Object httpPort = sr.getProperty("http.port"); + Object httpsPort = sr.getProperty("https.port"); + nodeHttp = new NodeHttp(httpService, node); + if (log.isDebugEnabled()) + log.debug("HTTP " + httpPort + + (httpsPort != null ? " - HTTPS " + httpsPort : "")); } private ExtendedHttpService waitForHttpService() { @@ -184,4 +250,62 @@ final class Kernel implements ServiceListener { + String.format("%.2f", 100 - (sleepAccuracy * 100 - 100)) + " %"); } + + /** Workaround for blocking Gogo shell by system shutdown. */ + private class GogoShellKiller extends Thread { + + public GogoShellKiller() { + super("Gogo shell killer"); + setDaemon(true); + } + + @Override + public void run() { + ThreadGroup rootTg = getRootThreadGroup(null); + Thread gogoShellThread = findGogoShellThread(rootTg); + if (gogoShellThread == null) + return; + while (getNonDaemonCount(rootTg) > 2) { + try { + Thread.sleep(100); + } catch (InterruptedException e) { + // silent + } + } + gogoShellThread = findGogoShellThread(rootTg); + if (gogoShellThread == null) + return; + System.exit(0); + } + } + + private static ThreadGroup getRootThreadGroup(ThreadGroup tg) { + if (tg == null) + tg = Thread.currentThread().getThreadGroup(); + if (tg.getParent() == null) + return tg; + else + return getRootThreadGroup(tg.getParent()); + } + + private static int getNonDaemonCount(ThreadGroup rootThreadGroup) { + Thread[] threads = new Thread[rootThreadGroup.activeCount()]; + rootThreadGroup.enumerate(threads); + int nonDameonCount = 0; + for (Thread t : threads) + if (!t.isDaemon()) + nonDameonCount++; + return nonDameonCount; + } + + private static Thread findGogoShellThread(ThreadGroup rootThreadGroup) { + Thread[] threads = new Thread[rootThreadGroup.activeCount()]; + rootThreadGroup.enumerate(threads, true); + for (Thread thread : threads) { + if (thread.getName().equals("Gogo shell")) + return thread; + } + return null; + } + } \ No newline at end of file