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=ef2403b445af8b665ec219929454f73e6fdcabb0;hpb=84591aefd3116474b79a7734b3ce5373ebdb0c29;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 ef2403b44..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,19 +1,16 @@
 package org.argeo.cms.internal.kernel;
 
-import java.util.Hashtable;
+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;
-import org.eclipse.rap.rwt.application.ApplicationConfiguration;
-import org.eclipse.rap.rwt.osgi.ApplicationLauncher;
-import org.eclipse.rap.ui.internal.servlet.WorkbenchApplicationConfiguration;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
@@ -27,9 +24,10 @@ import org.springframework.security.core.context.SecurityContextHolder;
  * <li>OS access</li>
  * </ul>
  */
-@SuppressWarnings("restriction")
 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;
 
@@ -38,8 +36,6 @@ final class Kernel {
 	private NodeSecurity nodeSecurity;
 	private NodeHttp nodeHttp;
 
-	private ServiceRegistration<ApplicationConfiguration> workbenchReg;
-
 	Kernel(BundleContext bundleContext) {
 		this.bundleContext = bundleContext;
 	}
@@ -55,7 +51,6 @@ final class Kernel {
 			repositoryFactory = new OsgiJackrabbitRepositoryFactory();
 			nodeSecurity = new NodeSecurity(bundleContext, node);
 			nodeHttp = new NodeHttp(bundleContext, node, nodeSecurity);
-			WorkbenchApplicationConfiguration wac = new WorkbenchApplicationConfiguration();
 
 			// Publish services to OSGi
 			nodeSecurity.publish();
@@ -63,43 +58,38 @@ final class Kernel {
 			bundleContext.registerService(RepositoryFactory.class,
 					repositoryFactory, null);
 			nodeHttp.publish();
-			registerWorkbench(wac);
 		} 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();
-		
-		// OSGi
-		workbenchReg.unregister();
 
 		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 ServiceRegistration<ApplicationConfiguration> registerWorkbench(
-			WorkbenchApplicationConfiguration wac) {
-		Hashtable<String, String> props = new Hashtable<String, String>();
-		props.put(ApplicationLauncher.PROPERTY_CONTEXT_NAME, "ui");
-		return bundleContext.registerService(ApplicationConfiguration.class,
-				wac, props);
-	}
-
-	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...");