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=1002304007ff3e64d42a86834a8de8a64fa95f6a;hb=070656b6431e699a0f6ac8dc1839bce3fc2509ce;hp=b95c195584d3986734efcef3b81f8fca50453819;hpb=ad9eb24753d1486113cfbc19d8080f15ce5ff68a;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 b95c19558..100230400 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 @@ -2,17 +2,23 @@ package org.argeo.cms.internal.kernel; import static bitronix.tm.TransactionManagerServices.getTransactionManager; import static bitronix.tm.TransactionManagerServices.getTransactionSynchronizationRegistry; +import static java.util.Locale.ENGLISH; import static org.argeo.cms.internal.kernel.KernelUtils.getFrameworkProp; -import static org.argeo.cms.internal.kernel.KernelUtils.getOsgiInstancePath; +import static org.argeo.cms.internal.kernel.KernelUtils.getOsgiInstanceDir; import static org.argeo.jcr.ArgeoJcrConstants.ALIAS_NODE; 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.File; +import java.io.FileFilter; +import java.io.IOException; import java.lang.management.ManagementFactory; import java.security.PrivilegedAction; import java.util.HashMap; import java.util.Hashtable; +import java.util.List; +import java.util.Locale; import java.util.Map; import javax.jcr.Repository; @@ -22,6 +28,7 @@ import javax.transaction.TransactionManager; import javax.transaction.TransactionSynchronizationRegistry; 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.util.TransientFileFactory; @@ -30,17 +37,20 @@ import org.argeo.ArgeoLogger; import org.argeo.cms.CmsException; import org.argeo.jackrabbit.OsgiJackrabbitRepositoryFactory; import org.argeo.jcr.ArgeoJcrConstants; +import org.eclipse.equinox.http.jetty.JettyConfigurator; +import org.eclipse.equinox.http.jetty.JettyConstants; 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.framework.ServiceRegistration; +import org.osgi.service.cm.Configuration; +import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.useradmin.UserAdmin; import bitronix.tm.BitronixTransactionManager; import bitronix.tm.BitronixTransactionSynchronizationRegistry; -import bitronix.tm.Configuration; import bitronix.tm.TransactionManagerServices; /** @@ -55,6 +65,10 @@ import bitronix.tm.TransactionManagerServices; * */ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { + /* + * SERVICE REFERENCES + */ + private ServiceReference configurationAdmin; /* * REGISTERED SERVICES */ @@ -84,8 +98,13 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { private DataHttp dataHttp; private KernelThread kernelThread; + private Locale defaultLocale = null; + private List locales = null; + public Kernel() { nodeSecurity = new NodeSecurity(); + // log.debug(bc.getDataFile("")); + // log.debug(bc.getDataFile("test")); } final void init() { @@ -101,24 +120,29 @@ 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(); Thread.currentThread().setContextClassLoader( Kernel.class.getClassLoader()); - // KernelUtils.logFrameworkProperties(log); - try { - // Initialise services + if (nodeSecurity.isFirstInit()) + firstInit(); + + defaultLocale = new Locale(getFrameworkProp(I18N_DEFAULT_LOCALE, + ENGLISH.getLanguage())); + locales = asLocaleList(getFrameworkProp(I18N_LOCALES)); logger = new NodeLogger(); - // transactionManager = new SimpleTransactionManager(); - initBitronixTransactionManager(); - repository = new NodeRepository(bc); + + // Initialise services + initTransactionManager(); + repository = new NodeRepository(); repositoryFactory = new OsgiJackrabbitRepositoryFactory(); userAdmin = new NodeUserAdmin(transactionManager, repository); // HTTP + initWebServer(conf); ServiceReference sr = bc .getServiceReference(ExtendedHttpService.class); if (sr != null) @@ -147,12 +171,53 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { directorsCut(initDuration); } - private void initBitronixTransactionManager() { - Configuration tmConf = TransactionManagerServices.getConfiguration(); + private void firstInit() { + log.info("## FIRST INIT ##"); + String nodeInit = getFrameworkProp(NODE_INIT); + if (nodeInit == null) + nodeInit = "../../init"; + File initDir; + if (nodeInit.startsWith(".")) + initDir = KernelUtils.getExecutionDir(nodeInit); + else + initDir = new File(nodeInit); + // TODO also uncompress archives + if (initDir.exists()) + try { + FileUtils.copyDirectory(initDir, getOsgiInstanceDir(), + new FileFilter() { + + @Override + public boolean accept(File pathname) { + if (pathname.getName().equals(".svn") + || pathname.getName().equals(".git")) + return false; + return true; + } + }); + log.info("CMS initialized from " + initDir.getCanonicalPath()); + } catch (IOException e) { + throw new CmsException("Cannot initialize from " + initDir, e); + } + } + + /** Can be null */ + private ConfigurationAdmin findConfigurationAdmin() { + configurationAdmin = bc.getServiceReference(ConfigurationAdmin.class); + if (configurationAdmin == null) { + return null; + } + return bc.getService(configurationAdmin); + } + + private void initTransactionManager() { + bitronix.tm.Configuration tmConf = TransactionManagerServices + .getConfiguration(); tmConf.setServerId(getFrameworkProp(FRAMEWORK_UUID)); - File tmBaseDir = new File(getFrameworkProp(TRANSACTIONS_HOME, - getOsgiInstancePath("transactions"))); + // File tmBaseDir = new File(getFrameworkProp(TRANSACTIONS_HOME, + // getOsgiInstancePath(DIR_TRANSACTIONS))); + File tmBaseDir = bc.getDataFile(DIR_TRANSACTIONS); File tmDir1 = new File(tmBaseDir, "btm1"); tmDir1.mkdirs(); tmConf.setLogPart1Filename(new File(tmDir1, tmDir1.getName() + ".tlog") @@ -165,6 +230,44 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { transactionSynchronizationRegistry = getTransactionSynchronizationRegistry(); } + private void initWebServer(ConfigurationAdmin conf) { + String httpPort = getFrameworkProp("org.osgi.service.http.port"); + String httpsPort = getFrameworkProp("org.osgi.service.http.port.secure"); + try { + if (httpPort != null || httpsPort != null) { + Hashtable jettyProps = new Hashtable(); + if (httpPort != null) { + jettyProps.put(JettyConstants.HTTP_PORT, httpPort); + jettyProps.put(JettyConstants.HTTP_ENABLED, true); + } + if (httpsPort != null) { + jettyProps.put(JettyConstants.HTTPS_PORT, httpsPort); + jettyProps.put(JettyConstants.HTTPS_ENABLED, true); + jettyProps.put(JettyConstants.SSL_KEYSTORETYPE, "PKCS12"); + jettyProps.put(JettyConstants.SSL_KEYSTORE, nodeSecurity + .getHttpServerKeyStore().getCanonicalPath()); + jettyProps.put(JettyConstants.SSL_PASSWORD, "changeit"); + jettyProps.put(JettyConstants.SSL_WANTCLIENTAUTH, true); + } + if (conf != null) { + // TODO make filter more generic + String filter = "(" + JettyConstants.HTTP_PORT + "=" + + httpPort + ")"; + if (conf.listConfigurations(filter) != null) + return; + Configuration jettyConf = conf.createFactoryConfiguration( + JETTY_FACTORY_PID, null); + jettyConf.update(jettyProps); + } else { + JettyConfigurator.startServer("default", jettyProps); + } + } + } catch (Exception e) { + throw new CmsException("Cannot initialize web server on " + + httpPortsMsg(httpPort, httpsPort), e); + } + } + private void publish() { // Listen to service publication (also ours) bc.addServiceListener(Kernel.this); @@ -275,27 +378,24 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { Object httpsPort = sr.getProperty("https.port"); dataHttp = new DataHttp(httpService, repository); if (log.isDebugEnabled()) - log.debug("HTTP " + httpPort - + (httpsPort != null ? " - HTTPS " + httpsPort : "")); + log.debug(httpPortsMsg(httpPort, httpsPort)); + } + + private String httpPortsMsg(Object httpPort, Object httpsPort) { + return "HTTP " + httpPort + + (httpsPort != null ? " - HTTPS " + httpsPort : ""); + } + + @Override + public Locale getDefaultLocale() { + return defaultLocale; } - // 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; - // } + /** Can be null. */ + @Override + public List getLocales() { + return locales; + } final private static void directorsCut(long initDuration) { // final long ms = 128l + (long) (Math.random() * 128d);