Oscar Scholten pushed to branch master at cms-community / hippo-repository

Commits:
9531fcf8 by Oscar Scholten at 2017-08-10T15:20:33+02:00
REPO-1 Fix javadoc typo

- - - - -
b57cbe67 by Oscar Scholten at 2017-08-10T15:21:09+02:00
REPO-1730 Fix usage of ExportConfig#getCategoryForItem

- - - - -


2 changed files:

- engine/src/main/java/org/onehippo/cm/engine/ExportConfig.java
- engine/src/main/java/org/onehippo/cm/engine/JcrConfigDeltaExporter.java


Changes:

=====================================
engine/src/main/java/org/onehippo/cm/engine/ExportConfig.java
=====================================
--- a/engine/src/main/java/org/onehippo/cm/engine/ExportConfig.java
+++ b/engine/src/main/java/org/onehippo/cm/engine/ExportConfig.java
@@ -63,7 +63,7 @@ public class ExportConfig {
     /**
      * Determine the category of a node or property at the specified absolute 
path. This method simply delegates to
      * {@link ConfigurationModelUtils#getCategoryForItem(String, boolean, 
ConfigurationModel)}, but custom ExporterConfig
-     * implementations like {@link 
org.onehippo.cm.engine.autoexport.ExporterConfig} can override this to
+     * implementations like {@link 
org.onehippo.cm.engine.autoexport.AutoExportConfig} can override this to
      * provide custom handling.
      *
      * @param absoluteNodePath absolute path to a node


=====================================
engine/src/main/java/org/onehippo/cm/engine/JcrConfigDeltaExporter.java
=====================================
--- a/engine/src/main/java/org/onehippo/cm/engine/JcrConfigDeltaExporter.java
+++ b/engine/src/main/java/org/onehippo/cm/engine/JcrConfigDeltaExporter.java
@@ -176,7 +176,7 @@ public class JcrConfigDeltaExporter extends 
JcrContentExporter {
     protected boolean shouldExcludeNode(final String jcrPath) {
         if (configurationModel != null) {
             // use getCategoryForItem from ExportConfig to account for 
possible exporter category overrides
-            final ConfigurationItemCategory category = 
exportConfig.getCategoryForItem(jcrPath, true, configurationModel);
+            final ConfigurationItemCategory category = 
exportConfig.getCategoryForItem(jcrPath, false, configurationModel);
             if (category != ConfigurationItemCategory.CONFIG) {
                 log.debug("Ignoring node because of category:{} \n\t{}", 
category, jcrPath);
                 return true;
@@ -358,7 +358,7 @@ public class JcrConfigDeltaExporter extends 
JcrContentExporter {
             }
             // use getCategoryForItem from ExportConfig to account for 
possible exporter category overrides
             final ConfigurationItemCategory category =
-                    exportConfig.getCategoryForItem(childNode.getPath(), true, 
configurationModel);
+                    exportConfig.getCategoryForItem(childNode.getPath(), 
false, configurationModel);
             if (category != ConfigurationItemCategory.CONFIG) {
                 log.debug("Ignoring child node because of category:{} \n\t{}", 
category, childNode.getPath());
                 continue;



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/compare/c5ac574b1048eb446342772667e79262d680d015...b57cbe67da87f841351b204bf704c62618ea7c1b

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/compare/c5ac574b1048eb446342772667e79262d680d015...b57cbe67da87f841351b204bf704c62618ea7c1b
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

Reply via email to