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=4b893f13d0b6e195be13c8354b8ab2dc756d8cb0;hpb=559786a622e24c7d213960a7873e105db82a03ab;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 4b893f13d..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
@@ -1,19 +1,14 @@
package org.argeo.cms.internal.kernel;
-import java.util.Hashtable;
-
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,10 +22,9 @@ import org.springframework.security.core.context.SecurityContextHolder;
*
OS access
*
*/
-@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 static final String PROP_WORKBENCH_AUTOSTART = "org.eclipse.rap.workbenchAutostart";
private final BundleContext bundleContext;
@@ -39,8 +33,6 @@ final class Kernel {
private NodeSecurity nodeSecurity;
private NodeHttp nodeHttp;
- private ServiceRegistration workbenchReg;
-
Kernel(BundleContext bundleContext) {
this.bundleContext = bundleContext;
}
@@ -63,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);
@@ -83,28 +69,28 @@ 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 ##");
}
- 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 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);