Massive Argeo APIs refactoring

[gpl/argeo-suite.git] / org.argeo.suite.core / src / org / argeo / suite / core / CustomMaintenanceService.java

diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/CustomMaintenanceService.java b/org.argeo.suite.core/src/org/argeo/suite/core/CustomMaintenanceService.java
index 2fd15d1575903b450255ee1a7ef41ad2b7bff20c..4cd05cfc92e903818e02ac2e6ff3127c795f4858 100644 (file)
--- a/org.argeo.suite.core/src/org/argeo/suite/core/CustomMaintenanceService.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/core/CustomMaintenanceService.java
@@ -11,15 +11,14 @@ import javax.jcr.ItemExistsException;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.entity.EntityType;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.maintenance.AbstractMaintenanceService;
 
 /** Base for custom initialisations. */
 public abstract class CustomMaintenanceService extends AbstractMaintenanceService {
-       private final static Log log = LogFactory.getLog(AbstractMaintenanceService.class);
+       private final static CmsLog log = CmsLog.getLog(AbstractMaintenanceService.class);
 
        protected List<String> getTypologies() {
                return new ArrayList<>();
@@ -34,14 +33,18 @@ public abstract class CustomMaintenanceService extends AbstractMaintenanceServic
                if (!typologies.isEmpty()) {
                        Node termsBase = JcrUtils.getOrAdd(customBaseNode, EntityType.terms.name(), EntityType.typologies.get());
                        for (String terms : typologies) {
-                               loadTerms(customBaseNode, terms);
+                               loadTerms(termsBase, terms);
                        }
+                       // TODO do not save here, so that upper layers can decide when to save
                        termsBase.getSession().save();
                }
        }
 
        protected void loadTerms(Node termsBase, String name) throws IOException, RepositoryException {
                try {
+//                     if (termsBase.hasNode(name))
+//                             return;
+
                        String termsLoadPath = getTypologiesLoadBase() + '/' + name + ".xml";
                        URL termsUrl = getClass().getClassLoader().getResource(termsLoadPath);
                        if (termsUrl == null)
@@ -59,6 +62,7 @@ public abstract class CustomMaintenanceService extends AbstractMaintenanceServic
                        }
                        if (log.isDebugEnabled())
                                log.debug("Terms '" + name + "' loaded.");
+                       // TODO do not save here, so that upper layers can decide when to save
                        termsBase.getSession().save();
                } catch (RepositoryException | IOException e) {
                        log.error("Cannot load terms '" + name + "': " + e.getMessage());