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=205ab35de7b0cc0f95ea1f5eb0618f2dc47568b3;hb=336930c69f0cd3e1242e518479624c6366541275;hp=c36658e116c9a009bf5e22c041972d6acdff9f5e;hpb=73ff3654ba6d4a8381b9be5594d0d56f214fac58;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 c36658e11..205ab35de 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
@@ -26,10 +26,10 @@ 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.osgi.useradmin.UserAdminConf;
-import org.argeo.util.naming.AttributesDictionary;
-import org.argeo.util.naming.LdifParser;
-import org.argeo.util.naming.LdifWriter;
+import org.argeo.util.directory.DirectoryConf;
+import org.argeo.util.directory.ldap.AttributesDictionary;
+import org.argeo.util.directory.ldap.LdifParser;
+import org.argeo.util.directory.ldap.LdifWriter;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
@@ -37,15 +37,6 @@ import org.osgi.service.cm.ConfigurationEvent;
 
 /** Manages the LDIF-based deployment configuration. */
 public class DeployConfig {
-	private final static LdapName USER_ADMIN_BASE_DN;
-	static {
-		try {
-			USER_ADMIN_BASE_DN = new LdapName(
-					CmsConstants.OU + "=" + CmsConstants.NODE_USER_ADMIN_PID + "," + CmsConstants.DEPLOY_BASEDN);
-		} catch (InvalidNameException e) {
-			throw new IllegalArgumentException(e);
-		}
-	}
 
 	private final CmsLog log = CmsLog.getLog(getClass());
 //	private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext();
@@ -79,59 +70,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(UserAdminConf.baseDn.name());
-				String cn;
-				if (CmsConstants.ROLES_BASEDN.equals(baseDn))
-					cn = ROLES;
-				else
-					cn = UserAdminConf.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(UserAdminConf.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() {
@@ -215,7 +197,7 @@ public class DeployConfig {
 					// service factory definition
 				}
 			} else {
-				Attribute disabled = deployConfig.get(UserAdminConf.disabled.name());
+				Attribute disabled = deployConfig.get(DirectoryConf.disabled.name());
 				if (disabled != null)
 					continue deployConfigs;
 				// service factory service
@@ -269,6 +251,14 @@ public class DeployConfig {
 	}
 
 	public Set<Dictionary<String, Object>> getUserDirectoryConfigs() {
+		// not static because class is not supported by Android
+		final LdapName USER_ADMIN_BASE_DN;
+		try {
+			USER_ADMIN_BASE_DN = new LdapName(
+					CmsConstants.OU + "=" + CmsConstants.NODE_USER_ADMIN_PID + "," + CmsConstants.DEPLOY_BASEDN);
+		} catch (InvalidNameException e) {
+			throw new IllegalArgumentException(e);
+		}
 		Set<Dictionary<String, Object>> res = new HashSet<>();
 		for (LdapName dn : deployConfigs.keySet()) {
 			if (dn.endsWith(USER_ADMIN_BASE_DN)) {
@@ -379,7 +369,7 @@ public class DeployConfig {
 
 		boolean hasDomain = false;
 		for (Configuration config : configs) {
-			Object realm = config.getProperties().get(UserAdminConf.realm.name());
+			Object realm = config.getProperties().get(DirectoryConf.realm.name());
 			if (realm != null) {
 				log.debug("Found realm: " + realm);
 				hasDomain = true;