X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsDeploymentImpl.java;h=2353250c5bf88284aab165b54109122e79c03770;hb=dca2b13e0e3ca3e7a9469e089b980c48c880ad1a;hp=4ffa03a63fffe2ff37d4f18db8494b849275c97a;hpb=33920c58e7946ff85b72c2ff513eb8ee4d2e1aa8;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java index 4ffa03a63..2353250c5 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java @@ -1,203 +1,73 @@ package org.argeo.cms.internal.runtime; -import java.io.IOException; -import java.net.URL; -import java.util.Dictionary; - import org.argeo.api.cms.CmsDeployment; import org.argeo.api.cms.CmsLog; import org.argeo.api.cms.CmsState; -import org.argeo.cms.internal.osgi.DeployConfig; +import org.argeo.cms.CmsDeployProperty; import org.osgi.service.http.HttpService; /** Implementation of a CMS deployment. */ public class CmsDeploymentImpl implements CmsDeployment { private final CmsLog log = CmsLog.getLog(getClass()); -// private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext(); - -// private Long availableSince; // Readiness -// private boolean nodeAvailable = false; -// private boolean userAdminAvailable = false; private boolean httpExpected = false; -// private boolean httpAvailable = false; private HttpService httpService; private CmsState cmsState; - private DeployConfig deployConfig; - - public CmsDeploymentImpl() { -// ServiceReference nodeStateSr = bc.getServiceReference(NodeState.class); -// if (nodeStateSr == null) -// throw new CmsException("No node state available"); - -// NodeState nodeState = bc.getService(nodeStateSr); -// cleanState = nodeState.isClean(); - -// nodeHttp = new NodeHttp(); - initTrackers(); - } - - private void initTrackers() { -// ServiceTracker httpSt = new ServiceTracker(bc, HttpService.class, null) { -// -// @Override -// public HttpService addingService(ServiceReference sr) { -// httpAvailable = true; -// Object httpPort = sr.getProperty("http.port"); -// Object httpsPort = sr.getProperty("https.port"); -// log.info(httpPortsMsg(httpPort, httpsPort)); -// checkReadiness(); -// return super.addingService(sr); -// } -// }; -// // httpSt.open(); -// KernelUtils.asyncOpen(httpSt); - -// ServiceTracker userAdminSt = new ServiceTracker(bc, UserAdmin.class, null) { -// @Override -// public UserAdmin addingService(ServiceReference reference) { -// UserAdmin userAdmin = super.addingService(reference); -// addStandardSystemRoles(userAdmin); -// userAdminAvailable = true; -// checkReadiness(); -// return userAdmin; -// } -// }; -// // userAdminSt.open(); -// KernelUtils.asyncOpen(userAdminSt); - -// ServiceTracker confAdminSt = new ServiceTracker(bc, -// ConfigurationAdmin.class, null) { -// @Override -// public ConfigurationAdmin addingService(ServiceReference reference) { -// ConfigurationAdmin configurationAdmin = bc.getService(reference); -//// boolean isClean; -//// try { -//// Configuration[] confs = configurationAdmin -//// .listConfigurations("(service.factoryPid=" + CmsConstants.NODE_USER_ADMIN_PID + ")"); -//// isClean = confs == null || confs.length == 0; -//// } catch (Exception e) { -//// throw new IllegalStateException("Cannot analyse clean state", e); -//// } -// deployConfig = new DeployConfig(configurationAdmin, isClean); -// Activator.registerService(CmsDeployment.class, CmsDeploymentImpl.this, null); -//// JcrInitUtils.addToDeployment(CmsDeployment.this); -// httpExpected = deployConfig.getProps(KernelConstants.JETTY_FACTORY_PID, "default") != null; -// try { -// Configuration[] configs = configurationAdmin -// .listConfigurations("(service.factoryPid=" + CmsConstants.NODE_USER_ADMIN_PID + ")"); -// -// boolean hasDomain = false; -// for (Configuration config : configs) { -// Object realm = config.getProperties().get(UserAdminConf.realm.name()); -// if (realm != null) { -// log.debug("Found realm: " + realm); -// hasDomain = true; -// } -// } -// if (hasDomain) { -// loadIpaJaasConfiguration(); -// } -// } catch (Exception e) { -// throw new IllegalStateException("Cannot initialize config", e); -// } -// return super.addingService(reference); -// } -// }; -// // confAdminSt.open(); -// KernelUtils.asyncOpen(confAdminSt); - } +// private DeployConfig deployConfig; public void start() { - httpExpected = deployConfig.getProps(KernelConstants.JETTY_FACTORY_PID, "default") != null; - if (deployConfig.hasDomain()) { - loadIpaJaasConfiguration(); - } - -// while (!isHttpAvailableOrNotExpected()) { -// try { -// Thread.sleep(100); -// } catch (InterruptedException e) { -// log.error("Interrupted while waiting for http"); -// } +// httpExpected = deployConfig.getProps(KernelConstants.JETTY_FACTORY_PID, "default") != null; +// if (deployConfig.hasDomain()) { +// loadIpaJaasConfiguration(); // } - } - - public void addFactoryDeployConfig(String factoryPid, Dictionary props) { - deployConfig.putFactoryDeployConfig(factoryPid, props); - deployConfig.save(); - try { - deployConfig.loadConfigs(); - } catch (IOException e) { - throw new IllegalStateException(e); - } - } - public Dictionary getProps(String factoryPid, String cn) { - return deployConfig.getProps(factoryPid, cn); + log.debug(() -> "CMS deployment available"); } -// private void addStandardSystemRoles(UserAdmin userAdmin) { -// // we assume UserTransaction is already available (TODO make it more robust) -// WorkTransaction userTransaction = bc.getService(bc.getServiceReference(WorkTransaction.class)); +// public void addFactoryDeployConfig(String factoryPid, Dictionary props) { +// deployConfig.putFactoryDeployConfig(factoryPid, props); +// deployConfig.save(); // try { -// userTransaction.begin(); -// Role adminRole = userAdmin.getRole(CmsConstants.ROLE_ADMIN); -// if (adminRole == null) { -// adminRole = userAdmin.createRole(CmsConstants.ROLE_ADMIN, Role.GROUP); -// } -// if (userAdmin.getRole(CmsConstants.ROLE_USER_ADMIN) == null) { -// Group userAdminRole = (Group) userAdmin.createRole(CmsConstants.ROLE_USER_ADMIN, Role.GROUP); -// userAdminRole.addMember(adminRole); -// } -// userTransaction.commit(); -// } catch (Exception e) { -// try { -// userTransaction.rollback(); -// } catch (Exception e1) { -// // silent -// } -// throw new IllegalStateException("Cannot add standard system roles", e); +// deployConfig.loadConfigs(); +// } catch (IOException e) { +// throw new IllegalStateException(e); // } +// } +// +// public Dictionary getProps(String factoryPid, String cn) { +// return deployConfig.getProps(factoryPid, cn); // } public boolean isHttpAvailableOrNotExpected() { return (httpExpected ? httpService != null : true); } - private void loadIpaJaasConfiguration() { - if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) { - String jaasConfig = KernelConstants.JAAS_CONFIG_IPA; - URL url = getClass().getClassLoader().getResource(jaasConfig); - KernelUtils.setJaasConfiguration(url); - log.debug("Set IPA JAAS configuration."); - } - } +// private void loadIpaJaasConfiguration() { +// if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) { +// String jaasConfig = KernelConstants.JAAS_CONFIG_IPA; +// URL url = getClass().getClassLoader().getResource(jaasConfig); +// KernelUtils.setJaasConfiguration(url); +// log.debug("Set IPA JAAS configuration."); +// } +// } public void stop() { -// if (nodeHttp != null) -// nodeHttp.destroy(); - -// try { -// JettyConfigurator.stopServer(KernelConstants.DEFAULT_JETTY_SERVER); -// } catch (Exception e) { -// log.error("Cannot stop default Jetty server.", e); +// if (deployConfig != null) { +// deployConfig.save(); // } - - if (deployConfig != null) { - deployConfig.save(); - // new Thread(() -> deployConfig.save(), "Save Argeo Deploy Config").start(); - } } - public void setDeployConfig(DeployConfig deployConfig) { - this.deployConfig = deployConfig; - } +// public void setDeployConfig(DeployConfig deployConfig) { +// this.deployConfig = deployConfig; +// } public void setCmsState(CmsState cmsState) { this.cmsState = cmsState; + String httpPort = this.cmsState.getDeployProperty(CmsDeployProperty.HTTP_PORT.getProperty()); + String httpsPort = this.cmsState.getDeployProperty(CmsDeployProperty.HTTPS_PORT.getProperty()); + httpExpected = httpPort != null || httpsPort != null; } public void setHttpService(HttpService httpService) {