X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=1f562b817cfeff0f1bcafeb3bfb222d96c537750;hb=6ed2ce8f490e2fc020e67f530f8c08e250b7b6dd;hp=d16ce555a01e962c2cd5f69e8913048d7c0bcc46;hpb=e5c68bdc434baea51c45f16948a615099aaa6c85;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 d16ce555a..1f562b817 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 @@ -41,6 +41,7 @@ import org.apache.jackrabbit.util.TransientFileFactory; import org.argeo.ArgeoException; import org.argeo.ArgeoLogger; import org.argeo.cms.CmsException; +import org.argeo.cms.maintenance.MaintenanceUi; import org.argeo.jackrabbit.OsgiJackrabbitRepositoryFactory; import org.argeo.jcr.ArgeoJcrConstants; import org.argeo.jcr.ArgeoJcrUtils; @@ -53,6 +54,7 @@ import org.osgi.framework.ServiceEvent; import org.osgi.framework.ServiceListener; import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; +import org.osgi.framework.startlevel.BundleStartLevel; import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.log.LogReaderService; @@ -113,6 +115,7 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { private List locales = null; public Kernel() { + // KernelUtils.logFrameworkProperties(log); nodeSecurity = new NodeSecurity(); } @@ -129,7 +132,6 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { private void doInit() { long begin = System.currentTimeMillis(); - ConfigurationAdmin conf = findConfigurationAdmin(); // Use CMS bundle classloader ClassLoader currentContextCl = Thread.currentThread() .getContextClassLoader(); @@ -149,35 +151,10 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { logger = new NodeLogger(logReaderService.getService()); logReaderService.close(); - // KernelUtils.logFrameworkProperties(log); - - // Initialise services - initTransactionManager(); - if (repository == null) - repository = new NodeRepository(); - if (repositoryFactory == null) - repositoryFactory = new OsgiJackrabbitRepositoryFactory(); - userAdmin = new NodeUserAdmin(transactionManager, repository); - - // HTTP - initWebServer(conf); - ServiceReference sr = bc - .getServiceReference(ExtendedHttpService.class); - if (sr != null) - addHttpService(sr); - - UserUi userUi = new UserUi(); - Hashtable props = new Hashtable(); - props.put("contextName", "user"); - bc.registerService(ApplicationConfiguration.class, userUi, props); - - // Kernel thread - kernelThread = new KernelThread(this); - kernelThread.setContextClassLoader(Kernel.class.getClassLoader()); - kernelThread.start(); - - // Publish services to OSGi - publish(); + if (isMaintenance()) + maintenanceInit(); + else + normalInit(); } catch (Exception e) { log.error("Cannot initialize Argeo CMS", e); throw new ArgeoException("Cannot initialize", e); @@ -194,6 +171,63 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { directorsCut(initDuration); } + private void normalInit() { + ConfigurationAdmin conf = findConfigurationAdmin(); + // Initialise services + initTransactionManager(); + if (repository == null) + repository = new NodeRepository(); + if (repositoryFactory == null) + repositoryFactory = new OsgiJackrabbitRepositoryFactory(); + userAdmin = new NodeUserAdmin(transactionManager, repository); + + // HTTP + initWebServer(conf); + ServiceReference sr = bc + .getServiceReference(ExtendedHttpService.class); + if (sr != null) + addHttpService(sr); + + // ADMIN UIs + UserUi userUi = new UserUi(); + Hashtable props = new Hashtable(); + props.put("contextName", "user"); + bc.registerService(ApplicationConfiguration.class, userUi, props); + + // Kernel thread + kernelThread = new KernelThread(this); + kernelThread.setContextClassLoader(Kernel.class.getClassLoader()); + kernelThread.start(); + + // Publish services to OSGi + publish(); + } + + private boolean isMaintenance() { + String startLevel = KernelUtils.getFrameworkProp("osgi.startLevel"); + if (startLevel == null) + return false; + int bundleStartLevel = bc.getBundle().adapt(BundleStartLevel.class) + .getStartLevel(); + // int frameworkStartLevel = + // bc.getBundle(0).adapt(BundleStartLevel.class) + // .getStartLevel(); + int frameworkStartLevel = Integer.parseInt(startLevel); + // int frameworkStartLevel = bc.getBundle(0) + // .adapt(FrameworkStartLevel.class).getStartLevel(); + return bundleStartLevel == frameworkStartLevel; + } + + private void maintenanceInit() { + log.info("## MAINTENANCE ##"); + bc.addServiceListener(Kernel.this); + initWebServer(null); + MaintenanceUi maintenanceUi = new MaintenanceUi(); + Hashtable props = new Hashtable(); + props.put("contextName", "maintenance"); + bc.registerService(ApplicationConfiguration.class, maintenanceUi, props); + } + private void firstInit() { log.info("## FIRST INIT ##"); String nodeInit = getFrameworkProp(NODE_INIT);