X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=af4f0ff2a75cd868d7597f42f35b63d0d9a8c9ae;hb=c96e271afb2614ebda4e312e4f27635f9f8e66df;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..af4f0ff2a 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,26 @@
package org.argeo.cms.internal.kernel;
-import java.util.Hashtable;
+import java.lang.management.ManagementFactory;
+import java.util.HashMap;
+import java.util.Map;
+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.rap.rwt.application.ApplicationConfiguration;
-import org.eclipse.rap.rwt.osgi.ApplicationLauncher;
-import org.eclipse.rap.ui.internal.servlet.WorkbenchApplicationConfiguration;
+import org.eclipse.equinox.http.servlet.ExtendedHttpService;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
+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;
/**
@@ -27,79 +34,139 @@ import org.springframework.security.core.context.SecurityContextHolder;
*
OS access
*
*/
-@SuppressWarnings("restriction")
-final class Kernel {
+final class Kernel implements ServiceListener {
private final static Log log = LogFactory.getLog(Kernel.class);
- private final BundleContext bundleContext;
+ private final BundleContext bundleContext = Activator.getBundleContext();
- private JackrabbitNode node;
- private RepositoryFactory repositoryFactory;
- private NodeSecurity nodeSecurity;
- private NodeHttp nodeHttp;
-
- private ServiceRegistration workbenchReg;
-
- Kernel(BundleContext bundleContext) {
- this.bundleContext = bundleContext;
- }
+ ThreadGroup threadGroup = new ThreadGroup(Kernel.class.getSimpleName());
+ JackrabbitNode node;
+ OsgiJackrabbitRepositoryFactory repositoryFactory;
+ NodeSecurity nodeSecurity;
+ NodeHttp nodeHttp;
+ private KernelThread kernelThread;
void init() {
+ ClassLoader currentContextCl = Thread.currentThread()
+ .getContextClassLoader();
+ Thread.currentThread().setContextClassLoader(
+ Kernel.class.getClassLoader());
long begin = System.currentTimeMillis();
InternalAuthentication initAuth = new InternalAuthentication(
KernelConstants.DEFAULT_SECURITY_KEY);
SecurityContextHolder.getContext().setAuthentication(initAuth);
try {
+ // Jackrabbit node
node = new JackrabbitNode(bundleContext);
+
+ // JCR repository factory
repositoryFactory = new OsgiJackrabbitRepositoryFactory();
+
+ // Authentication
nodeSecurity = new NodeSecurity(bundleContext, node);
- nodeHttp = new NodeHttp(bundleContext, node, nodeSecurity);
- WorkbenchApplicationConfiguration wac = new WorkbenchApplicationConfiguration();
+
+ // Equinox dependency
+ ExtendedHttpService httpService = waitForHttpService();
+ nodeHttp = new NodeHttp(httpService, node, nodeSecurity);
+
+ // Kernel thread
+ kernelThread = new KernelThread(this);
+ kernelThread.setContextClassLoader(Kernel.class.getClassLoader());
+ kernelThread.start();
// Publish services to OSGi
nodeSecurity.publish();
- node.publish();
+ node.publish(repositoryFactory);
bundleContext.registerService(RepositoryFactory.class,
repositoryFactory, null);
- nodeHttp.publish();
- registerWorkbench(wac);
+
+ 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 duration = System.currentTimeMillis() - begin;
- log.info("## ARGEO CMS UP in " + (duration / 1000) + "."
- + (duration % 1000) + "s ##");
- directorsCut();
+ long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime();
+ log.info("## ARGEO CMS UP in " + (jvmUptime / 1000) + "."
+ + (jvmUptime % 1000) + "s ##");
+ long initDuration = System.currentTimeMillis() - begin;
+ if (log.isTraceEnabled())
+ log.trace("Kernel initialization took " + initDuration + "ms");
+ directorsCut(initDuration);
}
void destroy() {
long begin = System.currentTimeMillis();
-
- // OSGi
- workbenchReg.unregister();
- nodeHttp = null;
- nodeSecurity.destroy();
- node.destroy();
+ kernelThread.destroyAndJoin();
+
+ 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();
long duration = System.currentTimeMillis() - begin;
log.info("## ARGEO CMS DOWN in " + (duration / 1000) + "."
+ (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);
+ @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);
+ Map props = new HashMap();
+ for (String key : sr.getPropertyKeys())
+ props.put(key, sr.getProperty(key));
+ if (ServiceEvent.REGISTERED == event.getType()) {
+ try {
+ repositoryFactory.register(repository, props);
+ nodeHttp.registerRepositoryServlets(alias, repository);
+ } catch (Exception e) {
+ throw new CmsException("Could not publish JCR repository "
+ + alias, e);
+ }
+ } else if (ServiceEvent.UNREGISTERING == event.getType()) {
+ repositoryFactory.unregister(repository, props);
+ nodeHttp.unregisterRepositoryServlets(alias);
+ }
+ }
+
}
- private void directorsCut() {
- final long ms = 128l + (long) (Math.random() * 128d);
+ private ExtendedHttpService waitForHttpService() {
+ final ServiceTracker st = new ServiceTracker(
+ 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;
+ }
+
+ final private static void directorsCut(long initDuration) {
+ // final long ms = 128l + (long) (Math.random() * 128d);
+ long ms = initDuration / 100;
log.info("Spend " + ms + "ms"
+ " reflecting on the progress brought to mankind"
+ " by Free Software...");
@@ -114,7 +181,7 @@ final class Kernel {
double sleepAccuracy = ((double) durationNano) / (ms * M);
if (log.isDebugEnabled())
log.debug("Sleep accuracy: "
- + String.format("%.2f", sleepAccuracy * 100) + " %");
+ + String.format("%.2f", 100 - (sleepAccuracy * 100 - 100))
+ + " %");
}
-
-}
+}
\ No newline at end of file