X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=08dad56b803c28bedf147e9e055ffa214e247e21;hb=a4a78ecbc3cfd119477264534c7d0cab541ae6ad;hp=ffba91a3e1a9346e4cd43154cdefba72b23738a5;hpb=2c6cfdaa28c8108817155d724b87bbbfd0392c7c;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 ffba91a3e..08dad56b8 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,15 +1,23 @@
 package org.argeo.cms.internal.kernel;
 
 import java.lang.management.ManagementFactory;
+import java.security.PrivilegedAction;
+import java.util.HashMap;
+import java.util.Map;
 
 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;
@@ -35,32 +43,35 @@ import org.springframework.security.core.context.SecurityContextHolder;
 final class Kernel implements ServiceListener {
 	private final static Log log = LogFactory.getLog(Kernel.class);
 
-	private final BundleContext bundleContext;
-	// private final ThreadGroup threadGroup = new
-	// ThreadGroup("Argeo CMS Kernel");
+	private final BundleContext bundleContext = Activator.getBundleContext();
+	private final NodeSecurity nodeSecurity;
 
-	private JackrabbitNode node;
-	private RepositoryFactory repositoryFactory;
-	private NodeSecurity nodeSecurity;
+	ThreadGroup threadGroup = new ThreadGroup(Kernel.class.getSimpleName());
+	JackrabbitNode node;
+
+	private SimpleTransactionManager transactionManager;
+	private OsgiJackrabbitRepositoryFactory repositoryFactory;
 	private NodeHttp nodeHttp;
+	private KernelThread kernelThread;
 
-	Kernel(BundleContext bundleContext) {
-		this.bundleContext = bundleContext;
+	public Kernel() {
+		nodeSecurity = new NodeSecurity(bundleContext);
 	}
 
-	void init() {
-		// new Thread(threadGroup, "init") {
-		// @Override
-		// public void run() {
-		// // CMS bundle classloader used during initialisation
-		// Thread.currentThread().setContextClassLoader(
-		// Kernel.class.getClassLoader());
-		doInit();
-		// }
-		// }.start();
+	final void init() {
+		Subject.doAs(nodeSecurity.getKernelSubject(),
+				new PrivilegedAction<Void>() {
+
+					@Override
+					public Void run() {
+						doInit();
+						return null;
+					}
+
+				});
 	}
 
-	protected void doInit() {
+	private void doInit() {
 		ClassLoader currentContextCl = Thread.currentThread()
 				.getContextClassLoader();
 		Thread.currentThread().setContextClassLoader(
@@ -71,17 +82,39 @@ final class Kernel implements ServiceListener {
 		SecurityContextHolder.getContext().setAuthentication(initAuth);
 
 		try {
+			// Transaction
+			transactionManager = new SimpleTransactionManager();
+
+			// Jackrabbit node
 			node = new JackrabbitNode(bundleContext);
+
+			// JCR repository factory
 			repositoryFactory = new OsgiJackrabbitRepositoryFactory();
-			nodeSecurity = new NodeSecurity(bundleContext, node);
+
+			// Authentication
+			nodeSecurity.getUserAdmin().setTransactionManager(
+					transactionManager);
 
 			// Equinox dependency
 			ExtendedHttpService httpService = waitForHttpService();
-			nodeHttp = new NodeHttp(httpService, node, nodeSecurity);
+			nodeHttp = new NodeHttp(httpService, node);
+
+			// Kernel thread
+			kernelThread = new KernelThread(this);
+			kernelThread.setContextClassLoader(Kernel.class.getClassLoader());
+			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();
+			node.publish(repositoryFactory);
 			bundleContext.registerService(RepositoryFactory.class,
 					repositoryFactory, null);
 
@@ -105,10 +138,12 @@ final class Kernel implements ServiceListener {
 	void destroy() {
 		long begin = System.currentTimeMillis();
 
+		kernelThread.destroyAndJoin();
+
 		if (nodeHttp != null)
 			nodeHttp.destroy();
-		if (nodeSecurity != null)
-			nodeSecurity.destroy();
+		// if (nodeSecurity != null)
+		// nodeSecurity.destroy();
 		if (node != null)
 			node.destroy();
 
@@ -117,6 +152,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 ##");
@@ -130,25 +169,45 @@ final class Kernel implements ServiceListener {
 		if (jcrRepoAlias != null) {// JCR repository
 			String alias = jcrRepoAlias.toString();
 			Repository repository = (Repository) bundleContext.getService(sr);
+			Map<String, Object> props = new HashMap<String, Object>();
+			for (String key : sr.getPropertyKeys())
+				props.put(key, sr.getProperty(key));
 			if (ServiceEvent.REGISTERED == event.getType()) {
 				try {
-					nodeHttp.registerWebdavServlet(alias, repository, true);
-					nodeHttp.registerWebdavServlet(alias, repository, false);
-					nodeHttp.registerRemotingServlet(alias, repository, true);
-					nodeHttp.registerRemotingServlet(alias, repository, false);
+					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);
 			}
 		}
 
 	}
 
+	private ExtendedHttpService waitForHttpService() {
+		final ServiceTracker<ExtendedHttpService, ExtendedHttpService> st = new ServiceTracker<ExtendedHttpService, ExtendedHttpService>(
+				bundleContext, ExtendedHttpService.class, null);
+		st.open();
+		ExtendedHttpService httpService;
+		try {
+			httpService = st.waitForService(1000);
+		} catch (InterruptedException e) {
+			httpService = null;
+		}
+
+		if (httpService == null)
+			throw new CmsException("Could not find "
+					+ ExtendedHttpService.class + " service.");
+		return httpService;
+	}
+
 	final private static void directorsCut(long initDuration) {
 		// final long ms = 128l + (long) (Math.random() * 128d);
-		long ms = initDuration / 10;
+		long ms = initDuration / 100;
 		log.info("Spend " + ms + "ms"
 				+ " reflecting on the progress brought to mankind"
 				+ " by Free Software...");
@@ -161,25 +220,67 @@ final class Kernel implements ServiceListener {
 		long durationNano = System.nanoTime() - beginNano;
 		final double M = 1000d * 1000d;
 		double sleepAccuracy = ((double) durationNano) / (ms * M);
-		if (log.isTraceEnabled())
-			log.trace("Sleep accuracy: "
-					+ String.format("%.2f", sleepAccuracy * 100) + " %");
+		if (log.isDebugEnabled())
+			log.debug("Sleep accuracy: "
+					+ String.format("%.2f", 100 - (sleepAccuracy * 100 - 100))
+					+ " %");
 	}
 
-	private ExtendedHttpService waitForHttpService() {
-		final ServiceTracker<ExtendedHttpService, ExtendedHttpService> st = new ServiceTracker<ExtendedHttpService, ExtendedHttpService>(
-				bundleContext, ExtendedHttpService.class, null);
-		st.open();
-		ExtendedHttpService httpService;
-		try {
-			httpService = st.waitForService(1000);
-		} catch (InterruptedException e) {
-			httpService = null;
+	/** Workaround for blocking Gogo shell by system shutdown. */
+	private class GogoShellKiller extends Thread {
+
+		public GogoShellKiller() {
+			super("Gogo shell killer");
+			setDaemon(true);
 		}
 
-		if (httpService == null)
-			throw new CmsException("Could not find "
-					+ ExtendedHttpService.class + " service.");
-		return httpService;
+		@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