X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=848206f5c5248833707a99838b92bceb3210d031;hb=0a63088e055dcd5ff397ce4e98d008c62c84dc98;hp=c813a9a37b207ee88cd6db20485419743ad147c2;hpb=aa409307c3f14b741fecbd98c7f91bdfdeb3166b;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 c813a9a37..848206f5c 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
@@ -7,7 +7,9 @@ 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.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
@@ -23,13 +25,16 @@ 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;
 
 	private JackrabbitNode node;
-	private OsgiJackrabbitRepositoryFactory repositoryFactory;
+	private RepositoryFactory repositoryFactory;
 	private NodeSecurity nodeSecurity;
-	private NodeHttpFilter httpFilter;
+	private NodeHttp nodeHttp;
+
+	private ServiceRegistration<ApplicationConfiguration> workbenchReg;
 
 	Kernel(BundleContext bundleContext) {
 		this.bundleContext = bundleContext;
@@ -45,14 +50,20 @@ final class Kernel {
 			node = new JackrabbitNode(bundleContext);
 			repositoryFactory = new OsgiJackrabbitRepositoryFactory();
 			nodeSecurity = new NodeSecurity(bundleContext, node);
-			httpFilter = new NodeHttpFilter(bundleContext, nodeSecurity);
+			nodeHttp = new NodeHttp(bundleContext, node, nodeSecurity);
 
-			// Publish services to OSGi register
+			// Publish services to OSGi
 			nodeSecurity.publish();
 			node.publish();
 			bundleContext.registerService(RepositoryFactory.class,
 					repositoryFactory, null);
-			httpFilter.publish();
+			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);
@@ -67,7 +78,10 @@ final class Kernel {
 	void destroy() {
 		long begin = System.currentTimeMillis();
 
-		httpFilter = null;
+		// OSGi
+		workbenchReg.unregister();
+
+		nodeHttp = null;
 		nodeSecurity.destroy();
 		node.destroy();
 
@@ -76,6 +90,17 @@ final class Kernel {
 				+ (duration % 1000) + "s ##");
 	}
 
+//	private void registerWorkbench(final WorkbenchApplicationConfiguration wac) {
+//		new Thread("Worbench Launcher") {
+//			public void run() {
+//				Hashtable<String, String> props = new Hashtable<String, String>();
+//				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"