import java.io.Writer;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.util.ArrayList;
import java.util.Dictionary;
import java.util.List;
import java.util.SortedMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.argeo.cms.CmsException;
+import org.argeo.naming.AttributesDictionary;
+import org.argeo.naming.LdifParser;
+import org.argeo.naming.LdifWriter;
import org.argeo.node.NodeConstants;
-import org.argeo.util.naming.AttributesDictionary;
-import org.argeo.util.naming.LdifParser;
-import org.argeo.util.naming.LdifWriter;
+import org.argeo.osgi.useradmin.UserAdminConf;
+import org.eclipse.equinox.http.jetty.JettyConfigurator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationEvent;
import org.osgi.service.cm.ConfigurationListener;
+/** Manages the LDIF-based deployment configuration. */
class DeployConfig implements ConfigurationListener {
private final Log log = LogFactory.getLog(getClass());
private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext();
- private Path deployConfigPath = KernelUtils.getOsgiInstancePath(KernelConstants.DEPLOY_CONFIG_PATH);
+ private static Path deployConfigPath = KernelUtils.getOsgiInstancePath(KernelConstants.DEPLOY_CONFIG_PATH);
private SortedMap<LdapName, Attributes> deployConfigs = new TreeMap<>();
+ private final DataModels dataModels;
- public DeployConfig(ConfigurationAdmin configurationAdmin,boolean isClean) {
+ public DeployConfig(ConfigurationAdmin configurationAdmin, DataModels dataModels, boolean isClean) {
+ this.dataModels = dataModels;
// ConfigurationAdmin configurationAdmin =
// bc.getService(bc.getServiceReference(ConfigurationAdmin.class));
try {
- if (!Files.exists(deployConfigPath)) { // first init
+ boolean isFirstInit = false;
+ if (!isInitialized()) { // first init
+ isFirstInit = true;
firstInit();
}
- init(configurationAdmin, isClean);
+ init(configurationAdmin, isClean, isFirstInit);
} catch (IOException e) {
throw new CmsException("Could not init deploy configs", e);
}
}
private void firstInit() throws IOException {
+ log.info("## FIRST INIT ##");
Files.createDirectories(deployConfigPath.getParent());
- FirstInitProperties firstInit = new FirstInitProperties();
- firstInit.prepareInstanceArea();
+ // FirstInit firstInit = new FirstInit();
+ InitUtils.prepareFirstInitInstanceArea();
- if (!Files.exists(deployConfigPath))// could have juste been copied
- Files.createFile(deployConfigPath);
-
- try (InputStream in = Files.newInputStream(deployConfigPath)) {
- deployConfigs = new LdifParser().read(in);
- }
+ if (!Files.exists(deployConfigPath))
+ deployConfigs = new TreeMap<>();
+ else// config file could have juste been copied by preparation
+ try (InputStream in = Files.newInputStream(deployConfigPath)) {
+ deployConfigs = new LdifParser().read(in);
+ }
+ save();
+ }
+ private void setFromFrameworkProperties(boolean isFirstInit) {
// node repository
- Dictionary<String, Object> nodeConfig = firstInit
- .getNodeRepositoryConfig(getProps(NodeConstants.NODE_REPOS_FACTORY_PID, NodeConstants.ALIAS_NODE));
+ Dictionary<String, Object> nodeConfig = InitUtils
+ .getNodeRepositoryConfig(getProps(NodeConstants.NODE_REPOS_FACTORY_PID, NodeConstants.NODE));
// node repository is mandatory
putFactoryDeployConfig(NodeConstants.NODE_REPOS_FACTORY_PID, nodeConfig);
- // user admin
+ // additional repositories
+ dataModels: for (DataModels.DataModel dataModel : dataModels.getNonAbstractDataModels()) {
+ if (NodeConstants.NODE.equals(dataModel.getName()))
+ continue dataModels;
+ Dictionary<String, Object> config = InitUtils.getRepositoryConfig(dataModel.getName(),
+ getProps(NodeConstants.NODE_REPOS_FACTORY_PID, dataModel.getName()));
+ if (config.size() != 0)
+ putFactoryDeployConfig(NodeConstants.NODE_REPOS_FACTORY_PID, config);
+ }
- List<Dictionary<String, Object>> userDirectoryConfigs = firstInit.getUserDirectoryConfigs();
- for (int i = 0; i < userDirectoryConfigs.size(); i++) {
- Dictionary<String, Object> userDirectoryConfig = userDirectoryConfigs.get(i);
- String cn = Integer.toString(i);
- userDirectoryConfig.put(NodeConstants.CN, cn);
- putFactoryDeployConfig(NodeConstants.NODE_USER_ADMIN_PID, userDirectoryConfig);
+ // user admin
+ List<Dictionary<String, Object>> userDirectoryConfigs = InitUtils.getUserDirectoryConfigs();
+ if (userDirectoryConfigs.size() != 0) {
+ List<String> activeCns = new ArrayList<>();
+ for (int i = 0; i < userDirectoryConfigs.size(); i++) {
+ Dictionary<String, Object> userDirectoryConfig = userDirectoryConfigs.get(i);
+ String cn = UserAdminConf.baseDnHash(userDirectoryConfig);
+ activeCns.add(cn);
+ userDirectoryConfig.put(NodeConstants.CN, cn);
+ putFactoryDeployConfig(NodeConstants.NODE_USER_ADMIN_PID, userDirectoryConfig);
+ }
+ // disable others
+ LdapName userAdminFactoryName = serviceFactoryDn(NodeConstants.NODE_USER_ADMIN_PID);
+ for (LdapName name : deployConfigs.keySet()) {
+ if (name.startsWith(userAdminFactoryName) && !name.equals(userAdminFactoryName)) {
+ try {
+ Attributes attrs = deployConfigs.get(name);
+ String cn = name.getRdn(name.size() - 1).getValue().toString();
+ if (!activeCns.contains(cn)) {
+ attrs.put(UserAdminConf.disabled.name(), "true");
+ }
+ } catch (Exception e) {
+ throw new CmsException("Cannot disable user directory " + name, e);
+ }
+ }
+ }
}
// http server
- Dictionary<String, Object> webServerConfig = firstInit
- .getHttpServerConfig(getProps(KernelConstants.JETTY_FACTORY_PID, NodeConstants.DEFAULT));
- if (!webServerConfig.isEmpty())
- putFactoryDeployConfig(KernelConstants.JETTY_FACTORY_PID, webServerConfig);
+// Dictionary<String, Object> webServerConfig = InitUtils
+// .getHttpServerConfig(getProps(KernelConstants.JETTY_FACTORY_PID, NodeConstants.DEFAULT));
+// if (!webServerConfig.isEmpty()) {
+// // TODO check for other customizers
+// webServerConfig.put("customizer.class", "org.argeo.equinox.jetty.CmsJettyCustomizer");
+// putFactoryDeployConfig(KernelConstants.JETTY_FACTORY_PID, webServerConfig);
+// }
+ LdapName defaultHttpServiceDn = serviceDn(KernelConstants.JETTY_FACTORY_PID, NodeConstants.DEFAULT);
+ if (deployConfigs.containsKey(defaultHttpServiceDn)) {
+ // remove old default configs since we have now to start Jetty servlet bridge
+ // indirectly
+ deployConfigs.remove(defaultHttpServiceDn);
+ }
+ // SAVE
save();
+ //
+
+ // Explicitly configures Jetty so that the default server is not started by the
+ // activator of the Equinox Jetty bundle.
+ Dictionary<String, Object> webServerConfig = InitUtils
+ .getHttpServerConfig(getProps(KernelConstants.JETTY_FACTORY_PID, NodeConstants.DEFAULT));
+ if (!webServerConfig.isEmpty()) {
+ webServerConfig.put("customizer.class", KernelConstants.CMS_JETTY_CUSTOMIZER_CLASS);
+ }
+
+ int tryCount = 60;
+ try {
+ tryGettyJetty: while (tryCount > 0) {
+ try {
+ JettyConfigurator.startServer(KernelConstants.DEFAULT_JETTY_SERVER, webServerConfig);
+ break tryGettyJetty;
+ } catch (IllegalStateException e) {
+ // Jetty may not be ready
+ try {
+ Thread.sleep(1000);
+ } catch (Exception e1) {
+ // silent
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error("Cannot start default Jetty server with config " + webServerConfig, e);
+ }
+
}
- private void init(ConfigurationAdmin configurationAdmin, boolean isClean) throws IOException {
+ private void init(ConfigurationAdmin configurationAdmin, boolean isClean, boolean isFirstInit) throws IOException {
try (InputStream in = Files.newInputStream(deployConfigPath)) {
deployConfigs = new LdifParser().read(in);
}
if (isClean) {
+ setFromFrameworkProperties(isFirstInit);
for (LdapName dn : deployConfigs.keySet()) {
Rdn lastRdn = dn.getRdn(dn.size() - 1);
LdapName prefix = (LdapName) dn.getPrefix(dn.size() - 1);
try (Writer writer = Files.newBufferedWriter(deployConfigPath)) {
new LdifWriter(writer).write(deployConfigs);
} catch (IOException e) {
- throw new CmsException("Cannot save deploy configs", e);
+ // throw new CmsException("Cannot save deploy configs", e);
+ log.error("Cannot save deploy configs", e);
}
}
+ boolean isStandalone(String dataModelName) {
+ return getProps(NodeConstants.NODE_REPOS_FACTORY_PID, dataModelName) != null;
+ }
+
/*
* UTILITIES
*/
return null;
}
+ static boolean isInitialized() {
+ return Files.exists(deployConfigPath);
+ }
+
}
projects / lgpl / argeo-commons.git / blobdiff