X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=a67900ca69873885e1bd551fbfcbd68c4444a0c5;hb=3d611c76cc8df95ab66d27307acf9521c3130556;hp=d4092371a402ada6cbef1d09e9f6ce9ed5c8411f;hpb=1928d251fb3a6ce463efbc3405c5337cc59c9dda;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 d4092371a..a67900ca6 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 @@ -3,16 +3,15 @@ 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.apache.commons.io.FileUtils.copyDirectory; import static org.argeo.cms.internal.kernel.KernelUtils.getFrameworkProp; import static org.argeo.cms.internal.kernel.KernelUtils.getOsgiInstanceDir; -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.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; @@ -29,25 +28,33 @@ 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.api.JackrabbitRepository; import org.apache.jackrabbit.util.TransientFileFactory; import org.argeo.ArgeoException; 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.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.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; -import bitronix.tm.Configuration; import bitronix.tm.TransactionManagerServices; /** @@ -62,6 +69,10 @@ import bitronix.tm.TransactionManagerServices; * */ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { + /* + * SERVICE REFERENCES + */ + private ServiceReference configurationAdmin; /* * REGISTERED SERVICES */ @@ -69,7 +80,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; @@ -111,7 +122,7 @@ 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(); @@ -124,7 +135,14 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { defaultLocale = new Locale(getFrameworkProp(I18N_DEFAULT_LOCALE, ENGLISH.getLanguage())); locales = asLocaleList(getFrameworkProp(I18N_LOCALES)); - logger = new NodeLogger(); + + ServiceTracker logReaderService = new ServiceTracker( + bc, LogReaderService.class, null); + logReaderService.open(); + logger = new NodeLogger(logReaderService.getService()); + logReaderService.close(); + + // KernelUtils.logFrameworkProperties(log); // Initialise services initTransactionManager(); @@ -133,11 +151,17 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { 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()); @@ -163,24 +187,51 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener { 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"; + File initDir; + if (nodeInit.startsWith(".")) + initDir = KernelUtils.getExecutionDir(nodeInit); + else + initDir = new File(nodeInit); // TODO also uncompress archives if (initDir.exists()) try { - copyDirectory(initDir, getOsgiInstanceDir()); + 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() { - Configuration tmConf = TransactionManagerServices.getConfiguration(); + bitronix.tm.Configuration tmConf = TransactionManagerServices + .getConfiguration(); tmConf.setServerId(getFrameworkProp(FRAMEWORK_UUID)); - File tmBaseDir = new File(getFrameworkProp(TRANSACTIONS_HOME, - getOsgiInstancePath(DIR_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") @@ -193,6 +244,45 @@ 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); + } + } + + @SuppressWarnings("unchecked") private void publish() { // Listen to service publication (also ours) bc.addServiceListener(Kernel.this); @@ -212,8 +302,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); } @@ -303,8 +395,12 @@ 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