Start simplifying and clarifying CMS initialisation. Remove Jackrabbit

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / DeployConfig.java

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 9d2925948ceef806191c82f9aa508697ad755da3..2bbd8f21922623558fe222e3719e6c879f0ae0a1 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
@@ -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);