X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FDeployConfig.java;h=2bbd8f21922623558fe222e3719e6c879f0ae0a1;hb=fb22feb37b0c2340d3d846dce4b6f47d0f728efb;hp=d52fe663bdea694c360ecadb622fa4d02401c09f;hpb=a940a66aca249a1ce7dea66d43b0e2816845d7d1;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 d52fe663b..2bbd8f219 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
@@ -20,13 +20,13 @@ import javax.websocket.server.ServerEndpointConfig;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.api.NodeConstants;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.internal.http.InternalHttpConstants;
 import org.argeo.cms.websocket.CmsWebSocketConfigurator;
 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.eclipse.equinox.http.jetty.JettyConfigurator;
 import org.osgi.framework.BundleContext;
@@ -88,7 +88,7 @@ class DeployConfig implements ConfigurationListener {
 
 		// additional repositories
 		dataModels: for (DataModels.DataModel dataModel : dataModels.getNonAbstractDataModels()) {
-			if (NodeConstants.NODE.equals(dataModel.getName()))
+			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()));
@@ -174,6 +174,7 @@ class DeployConfig implements ConfigurationListener {
 					} catch (Exception e1) {
 						// silent
 					}
+					tryCount--;
 				}
 			}
 		} catch (Exception e) {
@@ -188,6 +189,8 @@ class DeployConfig implements ConfigurationListener {
 			deployConfigs = new LdifParser().read(in);
 		}
 		if (isClean) {
+			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);