X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=af4f0ff2a75cd868d7597f42f35b63d0d9a8c9ae;hb=24c63057592c8ef8a161f3f37bbdafd0cd475dd5;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..af4f0ff2a 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,8 @@
 package org.argeo.cms.internal.kernel;
 
 import java.lang.management.ManagementFactory;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.jcr.Repository;
 import javax.jcr.RepositoryFactory;
@@ -35,32 +37,16 @@ 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 JackrabbitNode node;
-	private RepositoryFactory repositoryFactory;
-	private NodeSecurity nodeSecurity;
-	private NodeHttp nodeHttp;
-
-	Kernel(BundleContext bundleContext) {
-		this.bundleContext = bundleContext;
-	}
+	ThreadGroup threadGroup = new ThreadGroup(Kernel.class.getSimpleName());
+	JackrabbitNode node;
+	OsgiJackrabbitRepositoryFactory repositoryFactory;
+	NodeSecurity nodeSecurity;
+	NodeHttp nodeHttp;
+	private KernelThread kernelThread;
 
 	void init() {
-		// new Thread(threadGroup, "init") {
-		// @Override
-		// public void run() {
-		// // CMS bundle classloader used during initialisation
-		// Thread.currentThread().setContextClassLoader(
-		// Kernel.class.getClassLoader());
-		doInit();
-		// }
-		// }.start();
-	}
-
-	protected void doInit() {
 		ClassLoader currentContextCl = Thread.currentThread()
 				.getContextClassLoader();
 		Thread.currentThread().setContextClassLoader(
@@ -71,17 +57,27 @@ final class Kernel implements ServiceListener {
 		SecurityContextHolder.getContext().setAuthentication(initAuth);
 
 		try {
+			// Jackrabbit node
 			node = new JackrabbitNode(bundleContext);
+
+			// JCR repository factory
 			repositoryFactory = new OsgiJackrabbitRepositoryFactory();
+
+			// Authentication
 			nodeSecurity = new NodeSecurity(bundleContext, node);
 
 			// Equinox dependency
 			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();
+			node.publish(repositoryFactory);
 			bundleContext.registerService(RepositoryFactory.class,
 					repositoryFactory, null);
 
@@ -105,6 +101,8 @@ final class Kernel implements ServiceListener {
 	void destroy() {
 		long begin = System.currentTimeMillis();
 
+		kernelThread.destroyAndJoin();
+
 		if (nodeHttp != null)
 			nodeHttp.destroy();
 		if (nodeSecurity != null)
@@ -130,42 +128,25 @@ 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);
 			}
 		}
 
 	}
 
-	final private static void directorsCut(long initDuration) {
-		// final long ms = 128l + (long) (Math.random() * 128d);
-		long ms = initDuration / 10;
-		log.info("Spend " + ms + "ms"
-				+ " reflecting on the progress brought to mankind"
-				+ " by Free Software...");
-		long beginNano = System.nanoTime();
-		try {
-			Thread.sleep(ms, 0);
-		} catch (InterruptedException e) {
-			// silent
-		}
-		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) + " %");
-	}
-
 	private ExtendedHttpService waitForHttpService() {
 		final ServiceTracker<ExtendedHttpService, ExtendedHttpService> st = new ServiceTracker<ExtendedHttpService, ExtendedHttpService>(
 				bundleContext, ExtendedHttpService.class, null);
@@ -182,4 +163,25 @@ final class Kernel implements ServiceListener {
 					+ ExtendedHttpService.class + " service.");
 		return httpService;
 	}
-}
+
+	final private static void directorsCut(long initDuration) {
+		// final long ms = 128l + (long) (Math.random() * 128d);
+		long ms = initDuration / 100;
+		log.info("Spend " + ms + "ms"
+				+ " reflecting on the progress brought to mankind"
+				+ " by Free Software...");
+		long beginNano = System.nanoTime();
+		try {
+			Thread.sleep(ms, 0);
+		} catch (InterruptedException e) {
+			// silent
+		}
+		long durationNano = System.nanoTime() - beginNano;
+		final double M = 1000d * 1000d;
+		double sleepAccuracy = ((double) durationNano) / (ms * M);
+		if (log.isDebugEnabled())
+			log.debug("Sleep accuracy: "
+					+ String.format("%.2f", 100 - (sleepAccuracy * 100 - 100))
+					+ " %");
+	}
+}
\ No newline at end of file