X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=68b3fa2891bf784ab5be47a33c254e1fa67fdc33;hb=86db10fcb2299ebf71d5599a80dc54444b26f893;hp=08dad56b803c28bedf147e9e055ffa214e247e21;hpb=a4a78ecbc3cfd119477264534c7d0cab541ae6ad;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 08dad56b8..68b3fa289 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,8 +1,18 @@ package org.argeo.cms.internal.kernel; +import static bitronix.tm.TransactionManagerServices.getTransactionManager; +import static bitronix.tm.TransactionManagerServices.getTransactionSynchronizationRegistry; +import static org.argeo.cms.internal.kernel.KernelUtils.getFrameworkProp; +import static org.argeo.cms.internal.kernel.KernelUtils.getOsgiInstancePath; +import static org.argeo.jcr.ArgeoJcrConstants.ALIAS_NODE; +import static org.argeo.jcr.ArgeoJcrConstants.JCR_REPOSITORY_ALIAS; +import static org.osgi.framework.Constants.FRAMEWORK_UUID; + +import java.io.File; import java.lang.management.ManagementFactory; import java.security.PrivilegedAction; import java.util.HashMap; +import java.util.Hashtable; import java.util.Map; import javax.jcr.Repository; @@ -16,18 +26,22 @@ 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.ArgeoLogger; 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; +import org.osgi.framework.ServiceRegistration; +import org.osgi.service.useradmin.UserAdmin; + +import bitronix.tm.BitronixTransactionManager; +import bitronix.tm.BitronixTransactionSynchronizationRegistry; +import bitronix.tm.Configuration; +import bitronix.tm.TransactionManagerServices; /** * Argeo CMS Kernel. Responsible for : @@ -40,34 +54,48 @@ import org.springframework.security.core.context.SecurityContextHolder; *
  • OS access
    • * */ -final class Kernel implements ServiceListener { - private final static Log log = LogFactory.getLog(Kernel.class); - - private final BundleContext bundleContext = Activator.getBundleContext(); - private final NodeSecurity nodeSecurity; +final class Kernel implements KernelConstants, ServiceListener { + /* + * REGISTERED SERVICES + */ + private ServiceRegistration loggerReg; + private ServiceRegistration tmReg; + private ServiceRegistration utReg; + private ServiceRegistration tsrReg; + private ServiceRegistration repositoryReg; + private ServiceRegistration repositoryFactoryReg; + private ServiceRegistration userAdminReg; + + /* + * SERVICES IMPLEMENTATIONS + */ + private NodeLogger logger; + private BitronixTransactionManager transactionManager; + private BitronixTransactionSynchronizationRegistry transactionSynchronizationRegistry; + private OsgiJackrabbitRepositoryFactory repositoryFactory; + NodeRepository repository; + private NodeUserAdmin userAdmin; + // Members + private final static Log log = LogFactory.getLog(Kernel.class); ThreadGroup threadGroup = new ThreadGroup(Kernel.class.getSimpleName()); - JackrabbitNode node; - - private SimpleTransactionManager transactionManager; - private OsgiJackrabbitRepositoryFactory repositoryFactory; - private NodeHttp nodeHttp; + private final BundleContext bc = Activator.getBundleContext(); + private final NodeSecurity nodeSecurity; + private DataHttp dataHttp; private KernelThread kernelThread; public Kernel() { - nodeSecurity = new NodeSecurity(bundleContext); + nodeSecurity = new NodeSecurity(); } final void init() { Subject.doAs(nodeSecurity.getKernelSubject(), new PrivilegedAction() { - @Override public Void run() { doInit(); return null; } - }); } @@ -77,27 +105,23 @@ final class Kernel implements ServiceListener { 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(); - // Jackrabbit node - node = new JackrabbitNode(bundleContext); + // KernelUtils.logFrameworkProperties(log); - // JCR repository factory + try { + // Initialise services + logger = new NodeLogger(); + // transactionManager = new SimpleTransactionManager(); + initBitronixTransactionManager(); + repository = new NodeRepository(bc); repositoryFactory = new OsgiJackrabbitRepositoryFactory(); + userAdmin = new NodeUserAdmin(transactionManager, repository); - // Authentication - nodeSecurity.getUserAdmin().setTransactionManager( - transactionManager); - - // Equinox dependency - ExtendedHttpService httpService = waitForHttpService(); - nodeHttp = new NodeHttp(httpService, node); + // HTTP + ServiceReference sr = bc + .getServiceReference(ExtendedHttpService.class); + if (sr != null) + addHttpService(sr); // Kernel thread kernelThread = new KernelThread(this); @@ -105,20 +129,7 @@ final class Kernel implements ServiceListener { kernelThread.start(); // Publish services to OSGi - bundleContext.registerService(TransactionManager.class, - transactionManager, null); - bundleContext.registerService(UserTransaction.class, - transactionManager, null); - bundleContext.registerService( - TransactionSynchronizationRegistry.class, - transactionManager.getTransactionSynchronizationRegistry(), - null); - nodeSecurity.publish(); - node.publish(repositoryFactory); - bundleContext.registerService(RepositoryFactory.class, - repositoryFactory, null); - - bundleContext.addServiceListener(Kernel.this); + publish(); } catch (Exception e) { log.error("Cannot initialize Argeo CMS", e); throw new ArgeoException("Cannot initialize", e); @@ -135,19 +146,65 @@ final class Kernel implements ServiceListener { directorsCut(initDuration); } + private void initBitronixTransactionManager() { + Configuration tmConf = TransactionManagerServices.getConfiguration(); + tmConf.setServerId(getFrameworkProp(FRAMEWORK_UUID)); + + File tmBaseDir = new File(getFrameworkProp(TRANSACTIONS_HOME, + getOsgiInstancePath("transactions"))); + File tmDir1 = new File(tmBaseDir, "btm1"); + tmDir1.mkdirs(); + tmConf.setLogPart1Filename(new File(tmDir1, tmDir1.getName() + ".tlog") + .getAbsolutePath()); + File tmDir2 = new File(tmBaseDir, "btm2"); + tmDir2.mkdirs(); + tmConf.setLogPart2Filename(new File(tmDir2, tmDir2.getName() + ".tlog") + .getAbsolutePath()); + transactionManager = getTransactionManager(); + transactionSynchronizationRegistry = getTransactionSynchronizationRegistry(); + } + + private void publish() { + // Listen to service publication (also ours) + bc.addServiceListener(Kernel.this); + + // Logging + loggerReg = bc.registerService(ArgeoLogger.class, logger, null); + // Transaction + tmReg = bc.registerService(TransactionManager.class, + transactionManager, null); + utReg = bc.registerService(UserTransaction.class, transactionManager, + null); + tsrReg = bc.registerService(TransactionSynchronizationRegistry.class, + transactionSynchronizationRegistry, null); + // User admin + userAdminReg = bc.registerService(UserAdmin.class, userAdmin, + userAdmin.currentState()); + // JCR + Hashtable regProps = new Hashtable(); + regProps.put(JCR_REPOSITORY_ALIAS, ALIAS_NODE); + repositoryReg = bc.registerService(Repository.class, repository, + regProps); + repositoryFactoryReg = bc.registerService(RepositoryFactory.class, + repositoryFactory, null); + } + void destroy() { long begin = System.currentTimeMillis(); + unpublish(); kernelThread.destroyAndJoin(); - if (nodeHttp != null) - nodeHttp.destroy(); - // if (nodeSecurity != null) - // nodeSecurity.destroy(); - if (node != null) - node.destroy(); + if (dataHttp != null) + dataHttp.destroy(); + if (userAdmin != null) + userAdmin.destroy(); + if (repository != null) + repository.destroy(); + if (transactionManager != null) + transactionManager.shutdown(); - bundleContext.removeServiceListener(this); + bc.removeServiceListener(this); // Clean hanging threads from Jackrabbit TransientFileFactory.shutdown(); @@ -161,50 +218,84 @@ final class Kernel implements ServiceListener { + (duration % 1000) + "s ##"); } + private void unpublish() { + userAdminReg.unregister(); + repositoryFactoryReg.unregister(); + repositoryReg.unregister(); + tmReg.unregister(); + utReg.unregister(); + tsrReg.unregister(); + loggerReg.unregister(); + } + @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); + Object service = bc.getService(sr); + if (service instanceof Repository) { + Object jcrRepoAlias = sr + .getProperty(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS); + if (jcrRepoAlias != null) {// JCR repository + String alias = jcrRepoAlias.toString(); + Repository repository = (Repository) bc.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); + dataHttp.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); + dataHttp.unregisterRepositoryServlets(alias); } + } + } else if (service instanceof ExtendedHttpService) { + if (ServiceEvent.REGISTERED == event.getType()) { + addHttpService(sr); } else if (ServiceEvent.UNREGISTERING == event.getType()) { - repositoryFactory.unregister(repository, props); - nodeHttp.unregisterRepositoryServlets(alias); + dataHttp.destroy(); + dataHttp = null; } } - } - 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; + private void addHttpService(ServiceReference sr) { + // for (String key : sr.getPropertyKeys()) + // log.debug(key + "=" + sr.getProperty(key)); + ExtendedHttpService httpService = (ExtendedHttpService) bc + .getService(sr); + // TODO find constants + Object httpPort = sr.getProperty("http.port"); + Object httpsPort = sr.getProperty("https.port"); + dataHttp = new DataHttp(httpService, repository); + if (log.isDebugEnabled()) + log.debug("HTTP " + httpPort + + (httpsPort != null ? " - HTTPS " + httpsPort : "")); } + // private ExtendedHttpService waitForHttpService() { + // final ServiceTracker st = new + // ServiceTracker( + // bc, 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;