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=95c76a0a03abbe2fad05066bdc863351c873e2bf;hpb=ea6fee548234d440510be4d67ea26dc36646f97a;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 95c76a0a0..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
@@ -23,13 +23,14 @@ 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;
 
 	Kernel(BundleContext bundleContext) {
 		this.bundleContext = bundleContext;
@@ -45,14 +46,14 @@ 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();
 		} catch (Exception e) {
 			log.error("Cannot initialize Argeo CMS", e);
 			throw new ArgeoException("Cannot initialize", e);
@@ -67,7 +68,7 @@ final class Kernel {
 	void destroy() {
 		long begin = System.currentTimeMillis();
 
-		httpFilter = null;
+		nodeHttp = null;
 		nodeSecurity.destroy();
 		node.destroy();
 
@@ -76,6 +77,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"
@@ -90,8 +102,9 @@ final class Kernel {
 		long durationNano = System.nanoTime() - beginNano;
 		final double M = 1000d * 1000d;
 		double sleepAccuracy = ((double) durationNano) / (ms * M);
-		log.debug("Sleep accuracy: "
-				+ String.format("%.2f", sleepAccuracy * 100) + " %");
+		if (log.isDebugEnabled())
+			log.debug("Sleep accuracy: "
+					+ String.format("%.2f", sleepAccuracy * 100) + " %");
 	}
 
 }