For shutdown of some hanging Jackrabbit threads

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / Kernel.java

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 848206f5c5248833707a99838b92bceb3210d031..f2d3995d3e06a101b38d535f4d21f7b07d773a5b 100644 (file)
--- 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 ##");