X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FDeployConfig.java;h=036aa93d2156df3c07e53f4268180d4c8dca05a8;hb=a1e5c8447beec2b896b0a03e38a4c17608a4b85d;hp=228ccbb4a172d2bacae5af3e3ea385064c68de92;hpb=2606b4b145577c4767c37c464e3f517e49a98100;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 228ccbb4a..036aa93d2 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
@@ -12,6 +12,7 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 
 import javax.naming.InvalidNameException;
+import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
 import javax.naming.ldap.LdapName;
@@ -43,6 +44,10 @@ class DeployConfig implements ConfigurationListener {
 
 	private boolean isFirstInit = false;
 
+	private final static String ROLES = "roles";
+	
+	private ConfigurationAdmin configurationAdmin;
+
 	public DeployConfig(ConfigurationAdmin configurationAdmin, DataModels dataModels, boolean isClean) {
 		this.dataModels = dataModels;
 		// ConfigurationAdmin configurationAdmin =
@@ -52,6 +57,7 @@ class DeployConfig implements ConfigurationListener {
 				isFirstInit = true;
 				firstInit();
 			}
+			this.configurationAdmin = configurationAdmin;
 			init(configurationAdmin, isClean, isFirstInit);
 		} catch (IOException e) {
 			throw new RuntimeException("Could not init deploy configs", e);
@@ -77,21 +83,6 @@ class DeployConfig implements ConfigurationListener {
 	}
 
 	private void setFromFrameworkProperties(boolean isFirstInit) {
-		// node repository
-		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);
-
-		// additional repositories
-		dataModels: for (DataModels.DataModel dataModel : dataModels.getNonAbstractDataModels()) {
-			if (NodeConstants.NODE_REPOSITORY.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);
-		}
 
 		// user admin
 		List<Dictionary<String, Object>> userDirectoryConfigs = InitUtils.getUserDirectoryConfigs();
@@ -99,7 +90,12 @@ class DeployConfig implements ConfigurationListener {
 			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);
+				String baseDn = (String) userDirectoryConfig.get(UserAdminConf.baseDn.name());
+				String cn;
+				if (NodeConstants.ROLES_BASEDN.equals(baseDn))
+					cn = ROLES;
+				else
+					cn = UserAdminConf.baseDnHash(userDirectoryConfig);
 				activeCns.add(cn);
 				userDirectoryConfig.put(NodeConstants.CN, cn);
 				putFactoryDeployConfig(NodeConstants.NODE_USER_ADMIN_PID, userDirectoryConfig);
@@ -189,31 +185,58 @@ class DeployConfig implements ConfigurationListener {
 			if (log.isDebugEnabled())
 				log.debug("Clean state, loading from framework properties...");
 			setFromFrameworkProperties(isFirstInit);
-			for (LdapName dn : deployConfigs.keySet()) {
-				Rdn lastRdn = dn.getRdn(dn.size() - 1);
-				LdapName prefix = (LdapName) dn.getPrefix(dn.size() - 1);
-				if (prefix.toString().equals(NodeConstants.DEPLOY_BASEDN)) {
-					if (lastRdn.getType().equals(NodeConstants.CN)) {
-						// service
-						String pid = lastRdn.getValue().toString();
-						Configuration conf = configurationAdmin.getConfiguration(pid);
-						AttributesDictionary dico = new AttributesDictionary(deployConfigs.get(dn));
-						conf.update(dico);
-					} else {
-						// service factory definition
-					}
-				} else {
-					// service factory service
-					Rdn beforeLastRdn = dn.getRdn(dn.size() - 2);
-					assert beforeLastRdn.getType().equals(NodeConstants.OU);
-					String factoryPid = beforeLastRdn.getValue().toString();
-					Configuration conf = configurationAdmin.createFactoryConfiguration(factoryPid.toString(), null);
+			loadConfigs();
+		}
+		// TODO check consistency if not clean
+	}
+	
+	public void loadConfigs() throws IOException {
+		// FIXME make it more robust
+		Configuration systemRolesConf = null;
+		LdapName systemRolesDn;
+		try {
+			// FIXME make it more robust
+			systemRolesDn = new LdapName("cn=roles,ou=org.argeo.api.userAdmin,ou=deploy,ou=node");
+		} catch (InvalidNameException e) {
+			throw new IllegalArgumentException(e);
+		}
+		deployConfigs: for (LdapName dn : deployConfigs.keySet()) {
+			Rdn lastRdn = dn.getRdn(dn.size() - 1);
+			LdapName prefix = (LdapName) dn.getPrefix(dn.size() - 1);
+			if (prefix.toString().equals(NodeConstants.DEPLOY_BASEDN)) {
+				if (lastRdn.getType().equals(NodeConstants.CN)) {
+					// service
+					String pid = lastRdn.getValue().toString();
+					Configuration conf = configurationAdmin.getConfiguration(pid);
 					AttributesDictionary dico = new AttributesDictionary(deployConfigs.get(dn));
 					conf.update(dico);
+				} else {
+					// service factory definition
+				}
+			} else {
+				Attributes config = deployConfigs.get(dn);
+				Attribute disabled = config.get(UserAdminConf.disabled.name());
+				if (disabled != null)
+					continue deployConfigs;
+				// service factory service
+				Rdn beforeLastRdn = dn.getRdn(dn.size() - 2);
+				assert beforeLastRdn.getType().equals(NodeConstants.OU);
+				String factoryPid = beforeLastRdn.getValue().toString();
+				Configuration conf = configurationAdmin.createFactoryConfiguration(factoryPid.toString(), null);
+				if (systemRolesDn.equals(dn)) {
+					systemRolesConf = configurationAdmin.createFactoryConfiguration(factoryPid.toString(), null);
+				} else {
+					AttributesDictionary dico = new AttributesDictionary(config);
+					conf.update(dico);
 				}
 			}
 		}
-		// TODO check consistency if not clean
+
+		// system roles must be last since it triggers node user admin publication
+		if (systemRolesConf == null)
+			throw new IllegalStateException("System roles are not configured.");
+		systemRolesConf.update(new AttributesDictionary(deployConfigs.get(systemRolesDn)));
+		
 	}
 
 	@Override
@@ -335,7 +358,7 @@ class DeployConfig implements ConfigurationListener {
 		}
 	}
 
-	Dictionary<String, Object> getProps(String factoryPid, String cn) {
+public	Dictionary<String, Object> getProps(String factoryPid, String cn) {
 		Attributes attrs = deployConfigs.get(serviceDn(factoryPid, cn));
 		if (attrs != null)
 			return new AttributesDictionary(attrs);