X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FDeployConfig.java;h=b1e36633a1da9cd704d0e787e4fa8673a40d5c9d;hb=d9ff37f84e799028a1a0300850eccae77ced2024;hp=a9b30681bc32419f2858a7f59b9397f60336ae6d;hpb=85688af22a77f82e7762e11e6eb38c6367eddb6c;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
index a9b30681b..b1e36633a 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
@@ -5,6 +5,7 @@ import java.io.InputStream;
 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;
@@ -23,6 +24,7 @@ import org.argeo.naming.AttributesDictionary;
 import org.argeo.naming.LdifParser;
 import org.argeo.naming.LdifWriter;
 import org.argeo.node.NodeConstants;
+import org.argeo.osgi.useradmin.UserAdminConf;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.cm.Configuration;
@@ -34,17 +36,21 @@ 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);
 		}
@@ -53,49 +59,84 @@ class DeployConfig implements ConfigurationListener {
 	}
 
 	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
+		Dictionary<String, Object> webServerConfig = InitUtils
 				.getHttpServerConfig(getProps(KernelConstants.JETTY_FACTORY_PID, NodeConstants.DEFAULT));
-		if (!webServerConfig.isEmpty())
+		if (!webServerConfig.isEmpty()) {
+			// TODO chekc for other customizers
+			webServerConfig.put("customizer.class", "org.argeo.equinox.jetty.CmsJettyCustomizer");
 			putFactoryDeployConfig(KernelConstants.JETTY_FACTORY_PID, webServerConfig);
-
+		}
 		save();
 	}
 
-	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);
@@ -206,10 +247,15 @@ class DeployConfig implements ConfigurationListener {
 		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
 	 */
@@ -245,4 +291,8 @@ class DeployConfig implements ConfigurationListener {
 			return null;
 	}
 
+	static boolean isInitialized() {
+		return Files.exists(deployConfigPath);
+	}
+
 }