]> git.argeo.org Git - lgpl/argeo-commons.git/blobdiff - org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java
Simplify authentication
[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / Kernel.java
index cb47a11b36368f37361b8624053420e90a0b8e7b..68b3fa2891bf784ab5be47a33c254e1fa67fdc33 100644 (file)
@@ -1,10 +1,19 @@
 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 java.util.Properties;
 
 import javax.jcr.Repository;
 import javax.jcr.RepositoryFactory;
@@ -17,8 +26,8 @@ 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.eclipse.equinox.http.servlet.ExtendedHttpService;
@@ -26,8 +35,13 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceListener;
 import org.osgi.framework.ServiceReference;
-import org.osgi.service.http.HttpService;
-import org.osgi.util.tracker.ServiceTracker;
+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.osgi.util.tracker.ServiceTracker;
  * <li>OS access</li>
  * </ul>
  */
-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<ArgeoLogger> loggerReg;
+       private ServiceRegistration<TransactionManager> tmReg;
+       private ServiceRegistration<UserTransaction> utReg;
+       private ServiceRegistration<TransactionSynchronizationRegistry> tsrReg;
+       private ServiceRegistration<Repository> repositoryReg;
+       private ServiceRegistration<RepositoryFactory> repositoryFactoryReg;
+       private ServiceRegistration<UserAdmin> 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<Void>() {
-
                                        @Override
                                        public Void run() {
                                                doInit();
                                                return null;
                                        }
-
                                });
        }
 
@@ -78,24 +106,19 @@ final class Kernel implements ServiceListener {
                                Kernel.class.getClassLoader());
                long begin = System.currentTimeMillis();
 
-               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);
-                       ServiceReference<ExtendedHttpService> sr = bundleContext
+                       // HTTP
+                       ServiceReference<ExtendedHttpService> sr = bc
                                        .getServiceReference(ExtendedHttpService.class);
                        if (sr != null)
                                addHttpService(sr);
@@ -106,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);
@@ -136,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<String, String> regProps = new Hashtable<String, String>();
+               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();
@@ -162,73 +218,83 @@ 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 service = bundleContext.getService(sr);
+               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) bundleContext
-                                               .getService(sr);
+                               Repository repository = (Repository) bc.getService(sr);
                                Map<String, Object> props = new HashMap<String, Object>();
                                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);
+                                               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);
-                                       nodeHttp.unregisterRepositoryServlets(alias);
+                                       dataHttp.unregisterRepositoryServlets(alias);
                                }
                        }
                } else if (service instanceof ExtendedHttpService) {
                        if (ServiceEvent.REGISTERED == event.getType()) {
                                addHttpService(sr);
                        } else if (ServiceEvent.UNREGISTERING == event.getType()) {
-                               nodeHttp.destroy();
-                               nodeHttp = null;
+                               dataHttp.destroy();
+                               dataHttp = null;
                        }
                }
        }
 
        private void addHttpService(ServiceReference<?> sr) {
-//             for (String key : sr.getPropertyKeys())
-//                     log.debug(key + "=" + sr.getProperty(key));
-               ExtendedHttpService httpService = (ExtendedHttpService) bundleContext
+               // 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");
-               nodeHttp = new NodeHttp(httpService, node);
+               dataHttp = new DataHttp(httpService, repository);
                if (log.isDebugEnabled())
                        log.debug("HTTP " + httpPort
                                        + (httpsPort != null ? " - HTTPS " + httpsPort : ""));
        }
 
-       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;
-       }
+       // private ExtendedHttpService waitForHttpService() {
+       // final ServiceTracker<ExtendedHttpService, ExtendedHttpService> st = new
+       // ServiceTracker<ExtendedHttpService, ExtendedHttpService>(
+       // 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);