X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fosgi%2FDeployConfig.java;h=7f8db5a062cd3fca9bd110cf7ff5e250a91a6505;hb=7b40f4a109786e0f18ecf0155d883f0bb7a8c45f;hp=b8fa8a73f49438bc15bbd439c185151f08157fbf;hpb=e2ffdf6872592aa22d0de2b0ec69ee4eca698c45;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/osgi/DeployConfig.java b/org.argeo.cms/src/org/argeo/cms/internal/osgi/DeployConfig.java
index b8fa8a73f..7f8db5a06 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/osgi/DeployConfig.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/osgi/DeployConfig.java
@@ -23,9 +23,6 @@ import javax.naming.ldap.Rdn;
 
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsLog;
-import org.argeo.cms.internal.runtime.InitUtils;
-import org.argeo.cms.internal.runtime.KernelConstants;
-import org.argeo.cms.internal.runtime.KernelUtils;
 import org.argeo.util.directory.DirectoryConf;
 import org.argeo.util.directory.ldap.AttributesDictionary;
 import org.argeo.util.directory.ldap.LdifParser;
@@ -36,12 +33,13 @@ import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.cm.ConfigurationEvent;
 
 /** Manages the LDIF-based deployment configuration. */
+@Deprecated
 public class DeployConfig {
 
 	private final CmsLog log = CmsLog.getLog(getClass());
 //	private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext();
 
-	private static 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;
 
@@ -56,7 +54,7 @@ public class DeployConfig {
 		Files.createDirectories(deployConfigPath.getParent());
 
 		// FirstInit firstInit = new FirstInit();
-		InitUtils.prepareFirstInitInstanceArea();
+		//InitUtils.prepareFirstInitInstanceArea();
 
 		if (!Files.exists(deployConfigPath))
 			deployConfigs = new TreeMap<>();
@@ -70,59 +68,50 @@ public class DeployConfig {
 	private void setFromFrameworkProperties(boolean isFirstInit) {
 
 		// 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 baseDn = (String) userDirectoryConfig.get(DirectoryConf.baseDn.name());
-				String cn;
-				if (CmsConstants.ROLES_BASEDN.equals(baseDn))
-					cn = ROLES;
-				else
-					cn = DirectoryConf.baseDnHash(userDirectoryConfig);
-				activeCns.add(cn);
-				userDirectoryConfig.put(CmsConstants.CN, cn);
-				putFactoryDeployConfig(CmsConstants.NODE_USER_ADMIN_PID, userDirectoryConfig);
-			}
-			// disable others
-			LdapName userAdminFactoryName = serviceFactoryDn(CmsConstants.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(DirectoryConf.disabled.name(), "true");
-					}
-//					} catch (Exception e) {
-//						throw new CmsException("Cannot disable user directory " + name, e);
+//		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 baseDn = (String) userDirectoryConfig.get(DirectoryConf.baseDn.name());
+//				String cn;
+//				if (CmsConstants.ROLES_BASEDN.equals(baseDn))
+//					cn = ROLES;
+//				else
+//					cn = DirectoryConf.baseDnHash(userDirectoryConfig);
+//				activeCns.add(cn);
+//				userDirectoryConfig.put(CmsConstants.CN, cn);
+//				putFactoryDeployConfig(CmsConstants.NODE_USER_ADMIN_PID, userDirectoryConfig);
+//			}
+//			// disable others
+//			LdapName userAdminFactoryName = serviceFactoryDn(CmsConstants.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(DirectoryConf.disabled.name(), "true");
 //					}
-				}
-			}
-		}
+////					} catch (Exception e) {
+////						throw new CmsException("Cannot disable user directory " + name, e);
+////					}
+//				}
+//			}
+//		}
 
 		// http server
-		Dictionary<String, Object> webServerConfig = InitUtils
-				.getHttpServerConfig(getProps(KernelConstants.JETTY_FACTORY_PID, CmsConstants.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, CmsConstants.DEFAULT);
-//		if (deployConfigs.containsKey(defaultHttpServiceDn)) {
-//			// remove old default configs since we have now to start Jetty servlet bridge
-//			// indirectly
-//			deployConfigs.remove(defaultHttpServiceDn);
+//		Dictionary<String, Object> webServerConfig = InitUtils
+//				.getHttpServerConfig(getProps(KernelConstants.JETTY_FACTORY_PID, CmsConstants.DEFAULT));
+//		if (!webServerConfig.isEmpty()) {
+//			// TODO check for other customizers
+//			putFactoryDeployConfig(KernelConstants.JETTY_FACTORY_PID, webServerConfig);
 //		}
 
 		// SAVE
 		save();
 		//
 
-//		Dictionary<String, Object> webServerConfig = InitUtils
-//				.getHttpServerConfig(getProps(KernelConstants.JETTY_FACTORY_PID, CmsConstants.DEFAULT));
 	}
 
 	public void start() {