X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=e38704d5cd67df3f2571137ca2ce5f01f2e87657;hb=6e7769555f6ee64159bbdb5780e34957d6d8895e;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..e38704d5c 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,7 +1,5 @@
package org.argeo.cms.internal.kernel;
-import java.util.Hashtable;
-
import javax.jcr.RepositoryFactory;
import org.apache.commons.logging.Log;
@@ -9,11 +7,7 @@ import org.apache.commons.logging.LogFactory;
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 +21,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 final BundleContext bundleContext;
@@ -38,8 +32,6 @@ final class Kernel {
private NodeSecurity nodeSecurity;
private NodeHttp nodeHttp;
- private ServiceRegistration workbenchReg;
-
Kernel(BundleContext bundleContext) {
this.bundleContext = bundleContext;
}
@@ -55,7 +47,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,7 +54,6 @@ 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);
@@ -77,9 +67,6 @@ final class Kernel {
void destroy() {
long begin = System.currentTimeMillis();
-
- // OSGi
- workbenchReg.unregister();
nodeHttp = null;
nodeSecurity.destroy();
@@ -90,13 +77,16 @@ final class Kernel {
+ (duration % 1000) + "s ##");
}
- private ServiceRegistration registerWorkbench(
- WorkbenchApplicationConfiguration wac) {
- Hashtable props = new Hashtable();
- props.put(ApplicationLauncher.PROPERTY_CONTEXT_NAME, "ui");
- return bundleContext.registerService(ApplicationConfiguration.class,
- wac, props);
- }
+// 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);