X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=f2d3995d3e06a101b38d535f4d21f7b07d773a5b;hb=cb4de3944975b944c0a16ecc9cc28cc1b0470a46;hp=c38a4b29a73744eb4d553941bd646a0285066828;hpb=c322e016196139f7f4fb9192e5b1e773999143d0;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 c38a4b29a..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,6 +4,7 @@ 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,6 +24,7 @@ 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; @@ -47,7 +49,7 @@ final class Kernel { nodeSecurity = new NodeSecurity(bundleContext, node); nodeHttp = new NodeHttp(bundleContext, node, nodeSecurity); - // Publish services to OSGi register + // Publish services to OSGi nodeSecurity.publish(); node.publish(); bundleContext.registerService(RepositoryFactory.class, @@ -71,11 +73,25 @@ final class Kernel { 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 registerWorkbench(final WorkbenchApplicationConfiguration wac) { +// new Thread("Worbench Launcher") { +// public void run() { +// Hashtable props = new Hashtable(); +// props.put(ApplicationLauncher.PROPERTY_CONTEXT_NAME, "ui"); +// workbenchReg = bundleContext.registerService( +// ApplicationConfiguration.class, wac, props); +// } +// }.start(); +// } + private void directorsCut() { final long ms = 128l + (long) (Math.random() * 128d); log.info("Spend " + ms + "ms"