Improve CMS initialisation

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / Kernel.java

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 ad6ca084a345b20fa4f621b0bca45e719edf4cce..f0c2d90d1f99758a1adc4e9238afa93e3324c3f3 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java
@@ -2,15 +2,23 @@ package org.argeo.cms.internal.kernel;
 
 import java.lang.management.ManagementFactory;
 
+import javax.jcr.Repository;
 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.cms.CmsException;
 import org.argeo.jackrabbit.OsgiJackrabbitRepositoryFactory;
+import org.argeo.jcr.ArgeoJcrConstants;
 import org.argeo.security.core.InternalAuthentication;
+import org.eclipse.equinox.http.servlet.ExtendedHttpService;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceEvent;
+import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
@@ -24,12 +32,11 @@ import org.springframework.security.core.context.SecurityContextHolder;
  * <li>OS access</li>
  * </ul>
  */
-final class Kernel {
+final class Kernel implements ServiceListener {
        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 final ThreadGroup threadGroup = new ThreadGroup("Argeo CMS Kernel");
 
        private JackrabbitNode node;
        private RepositoryFactory repositoryFactory;
@@ -41,12 +48,19 @@ final class Kernel {
        }
 
        void init() {
-               ClassLoader currentContextCl = Thread.currentThread()
-                               .getContextClassLoader();
-               // We use the CMS bundle classloader during initialization
-               Thread.currentThread().setContextClassLoader(
-                               Kernel.class.getClassLoader());
+               new Thread(threadGroup, "init") {
+                       @Override
+                       public void run() {
+                               // CMS bundle classloader used during initialisation
+                               Thread.currentThread().setContextClassLoader(
+                                               Kernel.class.getClassLoader());
+                               doInit();
+                       }
+               }.start();
+       }
 
+       /** Run asynchronously */
+       protected void doInit() {
                long begin = System.currentTimeMillis();
                InternalAuthentication initAuth = new InternalAuthentication(
                                KernelConstants.DEFAULT_SECURITY_KEY);
@@ -56,19 +70,21 @@ final class Kernel {
                        node = new JackrabbitNode(bundleContext);
                        repositoryFactory = new OsgiJackrabbitRepositoryFactory();
                        nodeSecurity = new NodeSecurity(bundleContext, node);
-                       nodeHttp = new NodeHttp(bundleContext, node, nodeSecurity);
+
+                       // Equinox dependency
+                       ExtendedHttpService httpService = waitForHttpService();
+                       nodeHttp = new NodeHttp(httpService, node, nodeSecurity);
 
                        // Publish services to OSGi
                        nodeSecurity.publish();
                        node.publish();
                        bundleContext.registerService(RepositoryFactory.class,
                                        repositoryFactory, null);
-                       nodeHttp.publish();
+
+                       bundleContext.addServiceListener(Kernel.this);
                } catch (Exception e) {
                        log.error("Cannot initialize Argeo CMS", e);
                        throw new ArgeoException("Cannot initialize", e);
-               } finally {
-                       Thread.currentThread().setContextClassLoader(currentContextCl);
                }
 
                long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime();
@@ -83,9 +99,14 @@ final class Kernel {
        void destroy() {
                long begin = System.currentTimeMillis();
 
-               nodeHttp = null;
-               nodeSecurity.destroy();
-               node.destroy();
+               if (nodeHttp != null)
+                       nodeHttp.destroy();
+               if (nodeSecurity != null)
+                       nodeSecurity.destroy();
+               if (node != null)
+                       node.destroy();
+
+               bundleContext.removeServiceListener(this);
 
                // Clean hanging threads from Jackrabbit
                TransientFileFactory.shutdown();
@@ -95,7 +116,31 @@ final class Kernel {
                                + (duration % 1000) + "s ##");
        }
 
-       private void directorsCut(long initDuration) {
+       @Override
+       public void serviceChanged(ServiceEvent event) {
+               ServiceReference<?> sr = event.getServiceReference();
+               Object jcrRepoAlias = sr
+                               .getProperty(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS);
+               if (jcrRepoAlias != null) {// JCR repository
+                       String alias = jcrRepoAlias.toString();
+                       Repository repository = (Repository) bundleContext.getService(sr);
+                       if (ServiceEvent.REGISTERED == event.getType()) {
+                               try {
+                                       nodeHttp.registerWebdavServlet(alias, repository, true);
+                                       nodeHttp.registerWebdavServlet(alias, repository, false);
+                                       nodeHttp.registerRemotingServlet(alias, repository, true);
+                                       nodeHttp.registerRemotingServlet(alias, repository, false);
+                               } catch (Exception e) {
+                                       throw new CmsException("Could not publish JCR repository "
+                                                       + alias, e);
+                               }
+                       } else if (ServiceEvent.UNREGISTERING == event.getType()) {
+                       }
+               }
+
+       }
+
+       final private static void directorsCut(long initDuration) {
                // final long ms = 128l + (long) (Math.random() * 128d);
                long ms = initDuration / 10;
                log.info("Spend " + ms + "ms"
@@ -110,9 +155,25 @@ final class Kernel {
                long durationNano = System.nanoTime() - beginNano;
                final double M = 1000d * 1000d;
                double sleepAccuracy = ((double) durationNano) / (ms * M);
-               if (log.isDebugEnabled())
-                       log.debug("Sleep accuracy: "
+               if (log.isTraceEnabled())
+                       log.trace("Sleep accuracy: "
                                        + String.format("%.2f", sleepAccuracy * 100) + " %");
        }
 
+       private ExtendedHttpService waitForHttpService() {
+               final ServiceTracker<ExtendedHttpService, ExtendedHttpService> st = new ServiceTracker<ExtendedHttpService, ExtendedHttpService>(
+                               bundleContext, ExtendedHttpService.class, null);
+               st.open();
+               ExtendedHttpService httpService;
+               try {
+                       httpService = st.waitForService(1000);
+               } catch (InterruptedException e) {
+                       httpService = null;
+               }
+
+               if (httpService == null)
+                       throw new CmsException("Could not find "
+                                       + ExtendedHttpService.class + " service.");
+               return httpService;
+       }
 }