X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=189dd08d769b14f602391c14961caa98308e07fa;hb=e91af5c65a42b3ff98400caa552965cdb3f730e6;hp=ad6ca084a345b20fa4f621b0bca45e719edf4cce;hpb=a97f3e970dcf503523c9bbaa1ce0cc0a64239edb;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 ad6ca084a..189dd08d7 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,16 +1,32 @@
package org.argeo.cms.internal.kernel;
import java.lang.management.ManagementFactory;
+import java.security.PrivilegedAction;
+import java.util.HashMap;
+import java.util.Map;
+import javax.jcr.Repository;
import javax.jcr.RepositoryFactory;
+import javax.security.auth.Subject;
+import javax.transaction.TransactionManager;
+import javax.transaction.TransactionSynchronizationRegistry;
+import javax.transaction.UserTransaction;
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.cms.internal.transaction.SimpleTransactionManager;
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,46 +40,85 @@ import org.springframework.security.core.context.SecurityContextHolder;
*
OS access
*
*/
-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 BundleContext bundleContext = Activator.getBundleContext();
+ private final NodeSecurity nodeSecurity;
- private JackrabbitNode node;
- private RepositoryFactory repositoryFactory;
- private NodeSecurity nodeSecurity;
+ ThreadGroup threadGroup = new ThreadGroup(Kernel.class.getSimpleName());
+ JackrabbitNode node;
+
+ private SimpleTransactionManager transactionManager;
+ private OsgiJackrabbitRepositoryFactory repositoryFactory;
private NodeHttp nodeHttp;
+ private KernelThread kernelThread;
+
+ public Kernel() {
+ nodeSecurity = new NodeSecurity(bundleContext);
+ }
+
+ final void init() {
+ Subject.doAs(nodeSecurity.getKernelSubject(),
+ new PrivilegedAction() {
+
+ @Override
+ public Void run() {
+ doInit();
+ return null;
+ }
- Kernel(BundleContext bundleContext) {
- this.bundleContext = bundleContext;
+ });
}
- void init() {
+ private void doInit() {
ClassLoader currentContextCl = Thread.currentThread()
.getContextClassLoader();
- // We use the CMS bundle classloader during initialization
Thread.currentThread().setContextClassLoader(
Kernel.class.getClassLoader());
-
long begin = System.currentTimeMillis();
InternalAuthentication initAuth = new InternalAuthentication(
KernelConstants.DEFAULT_SECURITY_KEY);
SecurityContextHolder.getContext().setAuthentication(initAuth);
try {
+ // Transaction
+ transactionManager = new SimpleTransactionManager();
+ bundleContext.registerService(TransactionManager.class,
+ transactionManager, null);
+ bundleContext.registerService(UserTransaction.class,
+ transactionManager, null);
+ bundleContext.registerService(
+ TransactionSynchronizationRegistry.class,
+ transactionManager.getTransactionSynchronizationRegistry(),
+ null);
+
+ // Jackrabbit node
node = new JackrabbitNode(bundleContext);
+
+ // JCR repository factory
repositoryFactory = new OsgiJackrabbitRepositoryFactory();
- nodeSecurity = new NodeSecurity(bundleContext, node);
- nodeHttp = new NodeHttp(bundleContext, node, nodeSecurity);
+
+ // Authentication
+ nodeSecurity.getUserAdmin().setTransactionManager(
+ transactionManager);
+
+ // 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();
+
+ bundleContext.addServiceListener(Kernel.this);
} catch (Exception e) {
log.error("Cannot initialize Argeo CMS", e);
throw new ArgeoException("Cannot initialize", e);
@@ -83,21 +138,76 @@ final class Kernel {
void destroy() {
long begin = System.currentTimeMillis();
- 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();
+ // Clean hanging Gogo shell thread
+ new GogoShellKiller().start();
+
+ nodeSecurity.destroy();
long duration = System.currentTimeMillis() - begin;
log.info("## ARGEO CMS DOWN in " + (duration / 1000) + "."
+ (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);
+ 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 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 / 10;
+ long ms = initDuration / 100;
log.info("Spend " + ms + "ms"
+ " reflecting on the progress brought to mankind"
+ " by Free Software...");
@@ -112,7 +222,65 @@ 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))
+ + " %");
+ }
+
+ /** Workaround for blocking Gogo shell by system shutdown. */
+ private class GogoShellKiller extends Thread {
+
+ public GogoShellKiller() {
+ super("Gogo shell killer");
+ setDaemon(true);
+ }
+
+ @Override
+ public void run() {
+ ThreadGroup rootTg = getRootThreadGroup(null);
+ Thread gogoShellThread = findGogoShellThread(rootTg);
+ if (gogoShellThread == null)
+ return;
+ while (getNonDaemonCount(rootTg) > 2) {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ // silent
+ }
+ }
+ gogoShellThread = findGogoShellThread(rootTg);
+ if (gogoShellThread == null)
+ return;
+ System.exit(0);
+ }
+ }
+
+ private static ThreadGroup getRootThreadGroup(ThreadGroup tg) {
+ if (tg == null)
+ tg = Thread.currentThread().getThreadGroup();
+ if (tg.getParent() == null)
+ return tg;
+ else
+ return getRootThreadGroup(tg.getParent());
+ }
+
+ private static int getNonDaemonCount(ThreadGroup rootThreadGroup) {
+ Thread[] threads = new Thread[rootThreadGroup.activeCount()];
+ rootThreadGroup.enumerate(threads);
+ int nonDameonCount = 0;
+ for (Thread t : threads)
+ if (!t.isDaemon())
+ nonDameonCount++;
+ return nonDameonCount;
+ }
+
+ private static Thread findGogoShellThread(ThreadGroup rootThreadGroup) {
+ Thread[] threads = new Thread[rootThreadGroup.activeCount()];
+ rootThreadGroup.enumerate(threads, true);
+ for (Thread thread : threads) {
+ if (thread.getName().equals("Gogo shell"))
+ return thread;
+ }
+ return null;
}
-}
+}
\ No newline at end of file