X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=71b1a5bdd941e5f2489ac9055403eb9c2a4e166d;hb=7bc9403c96bbae11358978358cc902e3f2c6e508;hp=871163fc0f57df925446cc9c2a163e79cf1568b8;hpb=739faf3400e7f2f1b2bf06bd1ccf9da042c78f5b;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 871163fc0..71b1a5bdd 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 @@ -10,6 +10,8 @@ import static org.argeo.jcr.ArgeoJcrConstants.JCR_REPOSITORY_ALIAS; import static org.argeo.util.LocaleChoice.asLocaleList; import static org.osgi.framework.Constants.FRAMEWORK_UUID; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileFilter; import java.io.IOException; @@ -21,9 +23,14 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import javax.jcr.ImportUUIDBehavior; import javax.jcr.Repository; 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; @@ -31,23 +38,30 @@ import javax.transaction.UserTransaction; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.jackrabbit.api.JackrabbitRepository; 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; import org.eclipse.equinox.http.jetty.JettyConfigurator; import org.eclipse.equinox.http.jetty.JettyConstants; import org.eclipse.equinox.http.servlet.ExtendedHttpService; +import org.eclipse.rap.rwt.application.ApplicationConfiguration; import org.osgi.framework.BundleContext; 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; import org.osgi.service.useradmin.UserAdmin; +import org.osgi.util.tracker.ServiceTracker; import bitronix.tm.BitronixTransactionManager; import bitronix.tm.BitronixTransactionSynchronizationRegistry; @@ -76,7 +90,7 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { private ServiceRegistration tmReg; private ServiceRegistration utReg; private ServiceRegistration tsrReg; - private ServiceRegistration repositoryReg; + private ServiceRegistration repositoryReg; private ServiceRegistration repositoryFactoryReg; private ServiceRegistration userAdminReg; @@ -96,15 +110,15 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { private final BundleContext bc = Activator.getBundleContext(); private final NodeSecurity nodeSecurity; private DataHttp dataHttp; + private NodeHttp nodeHttp; private KernelThread kernelThread; private Locale defaultLocale = null; private List locales = null; public Kernel() { + // KernelUtils.logFrameworkProperties(log); nodeSecurity = new NodeSecurity(); - // log.debug(bc.getDataFile("")); - // log.debug(bc.getDataFile("test")); } final void init() { @@ -120,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(); @@ -133,33 +146,29 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { defaultLocale = new Locale(getFrameworkProp(I18N_DEFAULT_LOCALE, ENGLISH.getLanguage())); locales = asLocaleList(getFrameworkProp(I18N_LOCALES)); - logger = new NodeLogger(); - // Initialise services - initTransactionManager(); - repository = new NodeRepository(); - repositoryFactory = new OsgiJackrabbitRepositoryFactory(); - userAdmin = new NodeUserAdmin(transactionManager, repository); + ServiceTracker logReaderService = new ServiceTracker( + bc, LogReaderService.class, null); + logReaderService.open(); + logger = new NodeLogger(logReaderService.getService()); + logReaderService.close(); - // HTTP - initWebServer(conf); - ServiceReference sr = bc - .getServiceReference(ExtendedHttpService.class); - if (sr != null) - addHttpService(sr); - - // 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(); @@ -171,10 +180,77 @@ 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 ##"); - File initDir = new File(getFrameworkProp(NODE_INIT, - KernelUtils.getOsgiInstancePath("../../../init"))); + String nodeInit = getFrameworkProp(NODE_INIT); + if (nodeInit == null) + nodeInit = "../../init"; + if (nodeInit.startsWith("http")) { + remoteFirstInit(nodeInit); + return; + } + File initDir; + if (nodeInit.startsWith(".")) + initDir = KernelUtils.getExecutionDir(nodeInit); + else + initDir = new File(nodeInit); // TODO also uncompress archives if (initDir.exists()) try { @@ -195,6 +271,32 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { } } + private void remoteFirstInit(String uri) { + try { + repository = new NodeRepository(); + repositoryFactory = new OsgiJackrabbitRepositoryFactory(); + Repository remoteRepository = ArgeoJcrUtils.getRepositoryByUri( + repositoryFactory, uri); + Session remoteSession = remoteRepository + .login(new SimpleCredentials("root", "demo".toCharArray()), + "main"); + Session localSession = this.repository.login(); + // FIXME register node type + // if (false) + // CndImporter.registerNodeTypes(null, localSession); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + remoteSession.exportSystemView("/", out, true, false); + ByteArrayInputStream in = new ByteArrayInputStream( + out.toByteArray()); + localSession.importXML("/", in, + ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW); + // JcrUtils.copy(remoteSession.getRootNode(), + // localSession.getRootNode()); + } catch (Exception e) { + throw new CmsException("Cannot first init from " + uri, e); + } + } + /** Can be null */ private ConfigurationAdmin findConfigurationAdmin() { configurationAdmin = bc.getServiceReference(ConfigurationAdmin.class); @@ -262,6 +364,7 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { } } + @SuppressWarnings("unchecked") private void publish() { // Listen to service publication (also ours) bc.addServiceListener(Kernel.this); @@ -281,8 +384,10 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { // JCR Hashtable regProps = new Hashtable(); regProps.put(JCR_REPOSITORY_ALIAS, ALIAS_NODE); - repositoryReg = bc.registerService(Repository.class, repository, - regProps); + repositoryReg = (ServiceRegistration) bc + .registerService(new String[] { Repository.class.getName(), + JackrabbitRepository.class.getName() }, repository, + regProps); repositoryFactoryReg = bc.registerService(RepositoryFactory.class, repositoryFactory, null); } @@ -295,6 +400,8 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { if (dataHttp != null) dataHttp.destroy(); + if (nodeHttp != null) + nodeHttp.destroy(); if (userAdmin != null) userAdmin.destroy(); if (repository != null) @@ -371,6 +478,7 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { Object httpPort = sr.getProperty("http.port"); Object httpsPort = sr.getProperty("https.port"); dataHttp = new DataHttp(httpService, repository); + nodeHttp = new NodeHttp(httpService); if (log.isDebugEnabled()) log.debug(httpPortsMsg(httpPort, httpsPort)); } @@ -454,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; }