X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=3960be687ff91a0ec56408b30d8a167d01b134a9;hb=b7469a692d23890986d5c4880acabcf1f4f27027;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..3960be687 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
@@ -29,6 +29,8 @@ import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
 import javax.security.auth.Subject;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
 import javax.transaction.TransactionManager;
 import javax.transaction.TransactionSynchronizationRegistry;
 import javax.transaction.UserTransaction;
@@ -41,6 +43,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 +56,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 +117,7 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener {
 	private List<Locale> locales = null;
 
 	public Kernel() {
+		// KernelUtils.logFrameworkProperties(log);
 		nodeSecurity = new NodeSecurity();
 	}
 
@@ -129,7 +134,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,40 +153,22 @@ 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<ExtendedHttpService> sr = bc
-					.getServiceReference(ExtendedHttpService.class);
-			if (sr != null)
-				addHttpService(sr);
-
-			UserUi userUi = new UserUi();
-			Hashtable<String, String> props = new Hashtable<String, String>();
-			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);
 		} finally {
 			Thread.currentThread().setContextClassLoader(currentContextCl);
+			// FIXME better manage lifecycle.
+			try {
+				new LoginContext(LOGIN_CONTEXT_KERNEL,
+						nodeSecurity.getKernelSubject()).logout();
+			} catch (LoginException e) {
+				e.printStackTrace();
+			}
 		}
 
 		long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime();
@@ -194,6 +180,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<ExtendedHttpService> sr = bc
+				.getServiceReference(ExtendedHttpService.class);
+		if (sr != null)
+			addHttpService(sr);
+
+		// ADMIN UIs
+		UserUi userUi = new UserUi();
+		Hashtable<String, String> props = new Hashtable<String, String>();
+		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<String, String> props = new Hashtable<String, String>();
+		props.put("contextName", "maintenance");
+		bc.registerService(ApplicationConfiguration.class, maintenanceUi, props);
+	}
+
 	private void firstInit() {
 		log.info("## FIRST INIT ##");
 		String nodeInit = getFrameworkProp(NODE_INIT);
@@ -434,8 +477,8 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener {
 		// TODO find constants
 		Object httpPort = sr.getProperty("http.port");
 		Object httpsPort = sr.getProperty("https.port");
-		dataHttp = new DataHttp(httpService, repository);
-		nodeHttp = new NodeHttp(httpService);
+		dataHttp = new DataHttp(httpService);
+		nodeHttp = new NodeHttp(httpService, repository);
 		if (log.isDebugEnabled())
 			log.debug(httpPortsMsg(httpPort, httpsPort));
 	}
@@ -519,7 +562,7 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener {
 		rootThreadGroup.enumerate(threads);
 		int nonDameonCount = 0;
 		for (Thread t : threads)
-			if (!t.isDaemon())
+			if (t != null && !t.isDaemon())
 				nonDameonCount++;
 		return nonDameonCount;
 	}