X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=62efa364de3d470cd48b26b976f7be9033375efd;hb=2f7e4652af30d568491041ca2bed1c54b3246766;hp=c813a9a37b207ee88cd6db20485419743ad147c2;hpb=aa409307c3f14b741fecbd98c7f91bdfdeb3166b;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 c813a9a37..62efa364d 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,9 +1,12 @@
 package org.argeo.cms.internal.kernel;
 
+import java.lang.management.ManagementFactory;
+
 import javax.jcr.RepositoryFactory;
 
 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.jackrabbit.OsgiJackrabbitRepositoryFactory;
 import org.argeo.security.core.InternalAuthentication;
@@ -23,13 +26,15 @@ import org.springframework.security.core.context.SecurityContextHolder;
  */
 final class Kernel {
 	private final static Log log = LogFactory.getLog(Kernel.class);
+	// private static final String PROP_WORKBENCH_AUTOSTART =
+	// "org.eclipse.rap.workbenchAutostart";
 
 	private final BundleContext bundleContext;
 
 	private JackrabbitNode node;
-	private OsgiJackrabbitRepositoryFactory repositoryFactory;
+	private RepositoryFactory repositoryFactory;
 	private NodeSecurity nodeSecurity;
-	private NodeHttpFilter httpFilter;
+	private NodeHttp nodeHttp;
 
 	Kernel(BundleContext bundleContext) {
 		this.bundleContext = bundleContext;
@@ -45,39 +50,46 @@ final class Kernel {
 			node = new JackrabbitNode(bundleContext);
 			repositoryFactory = new OsgiJackrabbitRepositoryFactory();
 			nodeSecurity = new NodeSecurity(bundleContext, node);
-			httpFilter = new NodeHttpFilter(bundleContext, nodeSecurity);
+			nodeHttp = new NodeHttp(bundleContext, node, nodeSecurity);
 
-			// Publish services to OSGi register
+			// Publish services to OSGi
 			nodeSecurity.publish();
 			node.publish();
 			bundleContext.registerService(RepositoryFactory.class,
 					repositoryFactory, null);
-			httpFilter.publish();
+			nodeHttp.publish();
 		} catch (Exception e) {
 			log.error("Cannot initialize Argeo CMS", e);
 			throw new ArgeoException("Cannot initialize", e);
 		}
 
-		long duration = System.currentTimeMillis() - begin;
-		log.info("## ARGEO CMS UP in " + (duration / 1000) + "."
-				+ (duration % 1000) + "s ##");
-		directorsCut();
+		long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime();
+		log.info("## ARGEO CMS UP in " + (jvmUptime / 1000) + "."
+				+ (jvmUptime % 1000) + "s ##");
+		long initDuration = System.currentTimeMillis() - begin;
+		if (log.isTraceEnabled())
+			log.trace("Kernel initialization took " + initDuration + "ms");
+		directorsCut(initDuration);
 	}
 
 	void destroy() {
 		long begin = System.currentTimeMillis();
 
-		httpFilter = null;
+		nodeHttp = null;
 		nodeSecurity.destroy();
 		node.destroy();
 
+		// Clean hanging threads from Jackrabbit
+		TransientFileFactory.shutdown();
+
 		long duration = System.currentTimeMillis() - begin;
 		log.info("## ARGEO CMS DOWN in " + (duration / 1000) + "."
 				+ (duration % 1000) + "s ##");
 	}
 
-	private void directorsCut() {
-		final long ms = 128l + (long) (Math.random() * 128d);
+	private 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...");