X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=f2d3995d3e06a101b38d535f4d21f7b07d773a5b;hb=cb4de3944975b944c0a16ecc9cc28cc1b0470a46;hp=848206f5c5248833707a99838b92bceb3210d031;hpb=32ab2ae391458ee3782b0acfdaabdf11cb2094ed;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 848206f5c..f2d3995d3 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
@@ -4,12 +4,11 @@ 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.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
@@ -34,8 +33,6 @@ final class Kernel {
 	private NodeSecurity nodeSecurity;
 	private NodeHttp nodeHttp;
 
-	private ServiceRegistration<ApplicationConfiguration> workbenchReg;
-
 	Kernel(BundleContext bundleContext) {
 		this.bundleContext = bundleContext;
 	}
@@ -58,12 +55,6 @@ final class Kernel {
 			bundleContext.registerService(RepositoryFactory.class,
 					repositoryFactory, null);
 			nodeHttp.publish();
-
-//			if ("false".equals(bundleContext
-//					.getProperty(PROP_WORKBENCH_AUTOSTART))) {
-//				WorkbenchApplicationConfiguration wac = new WorkbenchApplicationConfiguration();
-//				registerWorkbench(wac);
-//			}
 		} catch (Exception e) {
 			log.error("Cannot initialize Argeo CMS", e);
 			throw new ArgeoException("Cannot initialize", e);
@@ -78,13 +69,13 @@ final class Kernel {
 	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 ##");