Peter Centgraf pushed to branch feature/REPO-1938 at cms-community /
hippo-repository
Commits:
03a464d8 by Peter Centgraf at 2018-02-14T13:22:55+01:00
REPO-1938 Move cleanFilePath/Name to cms-commons
- - - - -
2 changed files:
- engine/src/main/java/org/onehippo/cm/engine/ConfigurationServiceImpl.java
-
engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
Changes:
=====================================
engine/src/main/java/org/onehippo/cm/engine/ConfigurationServiceImpl.java
=====================================
--- a/engine/src/main/java/org/onehippo/cm/engine/ConfigurationServiceImpl.java
+++ b/engine/src/main/java/org/onehippo/cm/engine/ConfigurationServiceImpl.java
@@ -614,17 +614,6 @@ public class ConfigurationServiceImpl implements
InternalConfigurationService {
}
}
- private boolean storeBaselineModel(final ConfigurationModelImpl model) {
- try {
- baselineService.storeBaseline(model, session);
- // session.save() isn't necessary here, because storeBaseline()
already does it
- return true;
- } catch (Exception e) {
- log.error("Failed to store the Configuration baseline", e);
- return false;
- }
- }
-
/**
* Run all migrators. The session is expected to be clean (no pending
changes) when this method is called
* and after it returns. Failure of one migrator is not expected to
prevent any other from running unless the
@@ -660,6 +649,17 @@ public class ConfigurationServiceImpl implements
InternalConfigurationService {
}
}
+ private boolean storeBaselineModel(final ConfigurationModelImpl model) {
+ try {
+ baselineService.storeBaseline(model, session);
+ // session.save() isn't necessary here, because storeBaseline()
already does it
+ return true;
+ } catch (Exception e) {
+ log.error("Failed to store the Configuration baseline", e);
+ return false;
+ }
+ }
+
private boolean applyContent(final ConfigurationModelImpl model) {
try {
contentService.apply(model, session);
=====================================
engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
=====================================
---
a/engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
+++
b/engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
@@ -104,11 +104,10 @@ import static
org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static
org.onehippo.cm.engine.autoexport.AutoExportConstants.DEFAULT_MAIN_CONFIG_FILE;
import static org.onehippo.cm.model.Constants.YAML_EXT;
import static org.onehippo.cm.model.definition.DefinitionType.NAMESPACE;
-import static org.onehippo.cm.model.mapper.AbstractFileMapper.cleanFileName;
-import static org.onehippo.cm.model.mapper.AbstractFileMapper.cleanFilePath;
import static org.onehippo.cm.model.tree.ConfigurationItemCategory.SYSTEM;
import static org.onehippo.cm.model.tree.PropertyOperation.OVERRIDE;
import static org.onehippo.cm.model.tree.PropertyOperation.REPLACE;
+import static org.onehippo.cms7.util.FilePathUtils.cleanFilePath;
public class DefinitionMergeService {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/03a464d8575ff6fb108b1fd2df27b21c73233b52
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/03a464d8575ff6fb108b1fd2df27b21c73233b52
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
