[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10755
Michael Metternich pushed new branch bugfix/CMS-10755 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-configuration-management] Pushed new branch feature/HCM-164
Peter Centgraf pushed new branch feature/HCM-164 at cms-community / hippo-configuration-management ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][release/4.2] HSTTWO-4078 Fix concurrent modification exception
Michiel Eggermont pushed to branch release/4.2 at cms-community /
hippo-site-toolkit
Commits:
bf0c862d by Michiel Eggermont at 2017-07-04T15:57:03+02:00
HSTTWO-4078 Fix concurrent modification exception
Synchronize on load to prevent concurrent modification exceptions on
accessing the delegatee.
(cherry picked from commit a5b94c4)
- - - - -
1 changed file:
-
components/core/src/main/java/org/hippoecm/hst/configuration/channel/ChannelLazyLoadingChangedBySet.java
Changes:
=
components/core/src/main/java/org/hippoecm/hst/configuration/channel/ChannelLazyLoadingChangedBySet.java
=
---
a/components/core/src/main/java/org/hippoecm/hst/configuration/channel/ChannelLazyLoadingChangedBySet.java
+++
b/components/core/src/main/java/org/hippoecm/hst/configuration/channel/ChannelLazyLoadingChangedBySet.java
@@ -19,17 +19,18 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
+import java.util.function.Predicate;
import javax.jcr.ItemNotFoundException;
import javax.jcr.RepositoryException;
import org.apache.commons.lang.StringUtils;
-import org.hippoecm.hst.configuration.cache.HstNodeLoadingCache;
-import org.hippoecm.hst.configuration.internal.ConfigurationLockInfo;
import org.hippoecm.hst.configuration.HstNodeTypes;
+import org.hippoecm.hst.configuration.cache.HstNodeLoadingCache;
import org.hippoecm.hst.configuration.components.HstComponentConfiguration;
import org.hippoecm.hst.configuration.components.HstComponentsConfiguration;
import org.hippoecm.hst.configuration.internal.CanonicalInfo;
+import org.hippoecm.hst.configuration.internal.ConfigurationLockInfo;
import org.hippoecm.hst.configuration.model.HstNode;
import org.hippoecm.hst.configuration.model.ModelLoadingException;
import org.hippoecm.hst.configuration.site.HstSite;
@@ -45,7 +46,7 @@ public class ChannelLazyLoadingChangedBySet implements
Set {
private static final Logger log =
LoggerFactory.getLogger(ChannelLazyLoadingChangedBySet.class);
-private transient Set delegatee;
+private Set delegatee;
private transient Set usersWithMainConfigNodeChanges;
private transient final HstSite previewHstSite;
private transient final Channel channel;
@@ -67,7 +68,7 @@ public class ChannelLazyLoadingChangedBySet implements
Set {
this.hstNodeLoadingCache = hstNodeLoadingCache;
}
-private void load() {
+private synchronized void load() {
if (delegatee != null) {
return;
}
@@ -87,11 +88,11 @@ public class ChannelLazyLoadingChangedBySet implements
Set {
if (hstNodeLoadingCache != null && delegatee.size() > 0) {
// filter all system users out because they are not manageable
through the changed by set of a channel
try (HstNodeLoadingCache.LazyCloseableSession lazyCloseableSession
= hstNodeLoadingCache.createLazyCloseableSession()) {
-final SecurityService securityService =
((HippoWorkspace)lazyCloseableSession.getSession().getWorkspace()).getSecurityService();
+final SecurityService securityService = ((HippoWorkspace)
lazyCloseableSession.getSession().getWorkspace()).getSecurityService();
final Iterator iterator = delegatee.iterator();
while (iterator.hasNext()) {
- String userId = iterator.next();
+String userId = iterator.next();
try {
final User user = securityService.getUser(userId);
if (user.isSystemUser()) {
@@ -122,7 +123,7 @@ public class ChannelLazyLoadingChangedBySet implements
Set {
final Set
usersWithLock,
final String
previewConfigurationPath) {
-final boolean inherited =
!((CanonicalInfo)item).getCanonicalPath().startsWith(previewConfigurationPath +
"/");
+final boolean inherited = !((CanonicalInfo)
item).getCanonicalPath().startsWith(previewConfigurationPath + "/");
if (inherited) {
// skip inherited sitemap item changes as that is not supported
currently
return;
@@ -130,7 +131,7 @@ public class ChannelLazyLoadingChangedBySet implements
Set {
if (!(item instanceof ConfigurationLockInfo)) {
return;
}
-String lockedBy = ((ConfigurationLockInfo)item).getLockedBy();
+String lockedBy = ((ConfigurationLockInfo) item).getLockedBy();
if (StringUtils.isNotBlank(lockedBy)) {
usersWithLock.add(lockedBy);
}
@@ -156,7 +157,7 @@ public class ChannelLazyLoadingChangedBySet implements
Set {
if (!(config instanceof ConfigurationLockInfo)) {
return;
}
-String lockedBy = ((ConfigurationLockInfo)config).getLockedBy();
+String lockedBy
[HippoCMS-scm] [Git][cms-community/hippo-repository][master] REPO-1664 very trivial debug impr because migration might not be needed (for exa…
Ard Schrijvers pushed to branch master at cms-community / hippo-repository
Commits:
a5c183ed by Ard Schrijvers at 2017-07-04T16:09:23+02:00
REPO-1664 very trivial debug impr because migration might not be needed (for
example because project started at 12.0.0)
- - - - -
1 changed file:
- engine/src/main/java/org/hippoecm/repository/MigrateNodeTypesToV12.java
Changes:
=
engine/src/main/java/org/hippoecm/repository/MigrateNodeTypesToV12.java
=
--- a/engine/src/main/java/org/hippoecm/repository/MigrateNodeTypesToV12.java
+++ b/engine/src/main/java/org/hippoecm/repository/MigrateNodeTypesToV12.java
@@ -60,7 +60,7 @@ class MigrateNodeTypesToV12 {
public void migrateIfNeeded() throws RepositoryException {
if (!ntm.hasNodeType(DEPRECATED_NT_HIPPOSYS_AUTOEXPORT)) {
-log.debug("Already migrated");
+log.debug("No migration needed");
return;
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/a5c183edcea9680c70049dc224303ba1af4f0370
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch feature/REPO-1725
Peter Centgraf pushed new branch feature/REPO-1725 at cms-community / hippo-repository ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-release] Deleted branch bugfix/CMS-10821
Arthur Bogaart deleted branch bugfix/CMS-10821 at cms-community / hippo-cms-release ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][master] CMS-10821 Remove hst-configuration-editor dependencies
Arthur Bogaart pushed to branch master at cms-community / hippo-cms-release
Commits:
b6e0048c by Arthur Bogaart at 2017-07-04T11:31:08+02:00
CMS-10821 Remove hst-configuration-editor dependencies
- - - - -
1 changed file:
- pom.xml
Changes:
=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,6 @@
2.14.0-h1-SNAPSHOT
1.0.0-SNAPSHOT
-
4.0.0-SNAPSHOT
5.0.0-SNAPSHOT
4.0.0-SNAPSHOT
4.7.0-h1-SNAPSHOT
@@ -520,16 +519,6 @@
org.onehippo.cms7
-hippo-addon-hst-configuration-editor-frontend
-${hippo.addon-hst-configuration-editor.version}
-
-
-org.onehippo.cms7
-
hippo-addon-hst-configuration-editor-repository
-${hippo.addon-hst-configuration-editor.version}
-
-
-org.onehippo.cms7
hippo-addon-channel-manager-frontend-api
${hippo.addon-channel-manager.version}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-release/commit/b6e0048c02fac6fa84cf3798b9c8eea603da30b9
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch bugfix/CHANNELMGR-1319
Arthur Bogaart deleted branch bugfix/CHANNELMGR-1319 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CHANNELMGR-1348
Ariel Weinberger pushed new branch feature/CHANNELMGR-1348 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials-components] Pushed new branch bugfix/ESSCOM-21
Jeroen Hoffman pushed new branch bugfix/ESSCOM-21 at cms-community / hippo-essentials-components ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][master] REPO-1718 Refactor code to improve maintainability
Tobias Jeger pushed to branch master at cms-community / hippo-repository
Commits:
d8572ba7 by Tobias Jeger at 2017-07-04T12:22:54+02:00
REPO-1718 Refactor code to improve maintainability
- Express the skip child node locig more locally
- Log the skipping of child nodes at INFO level
- Avoid clearing the list of failed node paths for higher resilience
- - - - -
1 changed file:
- engine/src/main/java/org/onehippo/cm/engine/ConfigurationContentService.java
Changes:
=
engine/src/main/java/org/onehippo/cm/engine/ConfigurationContentService.java
=
---
a/engine/src/main/java/org/onehippo/cm/engine/ConfigurationContentService.java
+++
b/engine/src/main/java/org/onehippo/cm/engine/ConfigurationContentService.java
@@ -120,16 +120,19 @@ public class ConfigurationContentService {
final Optional optionalAction =
findLastActionToApply(baseNodePath, actionsToProcess);
final boolean nodeAlreadyProcessed =
configurationBaselineService.getAppliedContentPaths(session).contains(baseNodePath);
-final Optional failedParentPath =
failedPaths.stream().filter(baseNodePath::startsWith).findFirst();
+if (failedPaths.stream().anyMatch(baseNodePath::startsWith)) {
+log.info(String.format("Skipping the (re-)loading of content
based at '%s', " +
+"because the processing of an ancestor node has
failed.", baseNodePath));
+continue;
+}
-if (!failedParentPath.isPresent() && (optionalAction.isPresent()
|| !nodeAlreadyProcessed)) {
+if (optionalAction.isPresent() || !nodeAlreadyProcessed) {
final ActionType action =
optionalAction.orElse(ActionType.APPEND);
try {
if
(ConfigurationModelUtils.getCategoryForNode(baseNodePath, model) ==
ConfigurationItemCategory.CONTENT) {
log.debug("Processing {} action for node: {}", action,
baseNodePath);
contentProcessingService.apply(contentNode, action,
session);
-failedPaths.clear();
if (!nodeAlreadyProcessed) {
// will save all the session changes!
@@ -145,9 +148,6 @@ public class ConfigurationContentService {
log.error(String.format("Processing '%s' action for node
failed: '%s'", action, baseNodePath), ex);
failedPaths.add(baseNodePath);
}
-} else if (failedParentPath.isPresent()) {
-log.debug(String.format("Parent node '%s' processing failed,
skipping '%s'", failedParentPath.get(), baseNodePath));
-failedPaths.add(baseNodePath);
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/d8572ba77b1248c591d71f52ec42375b79fb77a5
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][master] REPO-1 Improve warning message
Tobias Jeger pushed to branch master at cms-community / hippo-repository
Commits:
e2865efe by Tobias Jeger at 2017-07-04T12:14:24+02:00
REPO-1 Improve warning message
- - - - -
1 changed file:
- engine/src/main/java/org/onehippo/cm/engine/JcrContentProcessor.java
Changes:
=
engine/src/main/java/org/onehippo/cm/engine/JcrContentProcessor.java
=
--- a/engine/src/main/java/org/onehippo/cm/engine/JcrContentProcessor.java
+++ b/engine/src/main/java/org/onehippo/cm/engine/JcrContentProcessor.java
@@ -141,7 +141,7 @@ public class JcrContentProcessor {
applyNode(definitionNode, parentNode, actionType,
unprocessedReferences);
applyUnprocessedReferences(unprocessedReferences);
} catch (Exception e) {
-log.warn(String.format("Content definition processing failed: %s",
definitionNode.getName()), e);
+log.warn(String.format("Content definition processing failed: %s",
definitionNode.getPath()), e);
if (e instanceof RepositoryException) {
throw (RepositoryException) e;
} else {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/e2865efe7017bcf480746d693b0e7eac42ce5714
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][master] REPO-1718 Import cleanup
Sergey Shepelevich pushed to branch master at cms-community / hippo-repository Commits: 3f4b3e3e by Sergey Shepelevich at 2017-07-04T11:49:54+02:00 REPO-1718 Import cleanup - - - - - 1 changed file: - engine/src/test/java/org/onehippo/cm/engine/ConfigurationContentServiceTest.java Changes: = engine/src/test/java/org/onehippo/cm/engine/ConfigurationContentServiceTest.java = --- a/engine/src/test/java/org/onehippo/cm/engine/ConfigurationContentServiceTest.java +++ b/engine/src/test/java/org/onehippo/cm/engine/ConfigurationContentServiceTest.java @@ -24,7 +24,6 @@ import org.junit.Before; import org.junit.Test; import org.onehippo.cm.model.ActionType; import org.onehippo.cm.model.ConfigurationItemCategory; -import org.onehippo.cm.model.DefinitionNode; import org.onehippo.cm.model.impl.ConfigurationModelImpl; import org.onehippo.cm.model.impl.ConfigurationNodeImpl; import org.onehippo.cm.model.impl.ContentDefinitionImpl; View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/3f4b3e3e13f64d1ba42d1bd9f6b51b9ef1fd0784 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] ESSENTIALS-1085 update copyright and improve comment
Tobias Jeger pushed to branch master at cms-community / hippo-essentials
Commits:
7f672fc6 by Tobias Jeger at 2017-07-04T11:41:08+02:00
ESSENTIALS-1085 update copyright and improve comment
- - - - -
2 changed files:
-
plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstruction.java
-
plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstructionTest.java
Changes:
=
plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstruction.java
=
---
a/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstruction.java
+++
b/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstruction.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2014-2017 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -232,7 +232,7 @@ public class XmlInstruction extends PluginInstruction {
/**
* Setting overwrite=true is not yet supported!
- * Invoking this method with value parameter override=true will result in
an UnsupportedOperationException been thrown
+ * Invoking this method with value parameter override=true will result in
an UnsupportedOperationException being thrown
* @throws UnsupportedOperationException when invoked with overwrite=true
* @param overwrite
*/
=
plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstructionTest.java
=
---
a/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstructionTest.java
+++
b/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstructionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2014-2017 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/7f672fc6c857cae7389b1540330bff63fa0c61ca
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] 2 commits: ESSENTIALS-1084 Remove usage and dependency on root node SNS support (unit-tests only)
Ate Douma pushed to branch master at cms-community / hippo-essentials
Commits:
d99575a2 by Ate Douma at 2017-07-04T11:17:07+02:00
ESSENTIALS-1084 Remove usage and dependency on root node SNS support
(unit-tests only)
- - - - -
10e1b392 by Ate Douma at 2017-07-04T11:35:41+02:00
ESSENTIALS-1085 disable usage of XmlInstruction.setOverwrite(true)
- - - - -
3 changed files:
-
plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstruction.java
-
plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstructionTest.java
-
plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/utils/CndUtilsTest.java
Changes:
=
plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstruction.java
=
---
a/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstruction.java
+++
b/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstruction.java
@@ -230,7 +230,16 @@ public class XmlInstruction extends PluginInstruction {
return overwrite;
}
-public void setOverwrite(final boolean overwrite) {
+/**
+ * Setting overwrite=true is not yet supported!
+ * Invoking this method with value parameter override=true will result in
an UnsupportedOperationException been thrown
+ * @throws UnsupportedOperationException when invoked with overwrite=true
+ * @param overwrite
+ */
+public void setOverwrite(final boolean overwrite) throws
UnsupportedOperationException {
+if (overwrite) {
+throw new UnsupportedOperationException("Setting override=true for
XmlInstruction is currently not supported");
+}
this.overwrite = overwrite;
}
=
plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstructionTest.java
=
---
a/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstructionTest.java
+++
b/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstructionTest.java
@@ -62,12 +62,13 @@ public class XmlInstructionTest extends BaseRepositoryTest {
status = executor.execute(set, getContext());
assertTrue("Expected SKIPPED but got: " + status, status ==
InstructionStatus.SKIPPED);
//
-// OVERRIDE TRUE TEST
+// OVERRIDE TRUE TEST: NOT SUPPORTED YET
//
+/*
addNodeInstruction.setOverwrite(true);
status = executor.execute(set, getContext());
assertTrue("Expected SUCCESS but got: " + status, status ==
InstructionStatus.SUCCESS);
-
+*/
//
// DELETE
=
plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/utils/CndUtilsTest.java
=
---
a/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/utils/CndUtilsTest.java
+++
b/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/utils/CndUtilsTest.java
@@ -41,8 +41,10 @@ public class CndUtilsTest extends BaseRepositoryTest {
public void testRegisterNamespaceUri() throws Exception {
Session session = getSession();
-session.getRootNode().addNode(HippoNodeType.NAMESPACES_PATH);
-session.save();
+if (!session.nodeExists("/"+HippoNodeType.NAMESPACES_PATH)) {
+session.getRootNode().addNode(HippoNodeType.NAMESPACES_PATH);
+session.save();
+}
CndUtils.registerNamespace(getContext(), TEST_PREFIX, TEST_URI);
assertTrue("CndUtils.registerNamespaceUri", true);
CndUtils.createHippoNamespace(getContext(), TEST_PREFIX);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/compare/746f0de6d38a90f620482c1b20b80be62b29420c...10e1b392405bb8b1cb46a06c1ed7aa4d7d7376df
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-release] Pushed new branch bugfix/CMS-10821
Arthur Bogaart pushed new branch bugfix/CMS-10821 at cms-community / hippo-cms-release ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][master] HSTTWO-4085 Remove usage and dependency on root node SNS support (unit-tests only)
Ate Douma pushed to branch master at cms-community / hippo-site-toolkit
Commits:
a10bba45 by Ate Douma at 2017-07-04T11:04:32+02:00
HSTTWO-4085 Remove usage and dependency on root node SNS support (unit-tests
only)
- - - - -
1 changed file:
-
components/core/src/test/java/org/hippoecm/hst/configuration/HstComponentsConfigurationModelsIT.java
Changes:
=
components/core/src/test/java/org/hippoecm/hst/configuration/HstComponentsConfigurationModelsIT.java
=
---
a/components/core/src/test/java/org/hippoecm/hst/configuration/HstComponentsConfigurationModelsIT.java
+++
b/components/core/src/test/java/org/hippoecm/hst/configuration/HstComponentsConfigurationModelsIT.java
@@ -437,7 +437,7 @@ public class HstComponentsConfigurationModelsIT extends
AbstractTestConfiguratio
}
private void removePagePrototypeFromConfig(final Session session) throws
RepositoryException {
-
session.move("/hst:hst/hst:configurations/unittestproject/hst:prototypepages",
"/hst:prototypepages");
+
session.getNode("/hst:hst/hst:configurations/unittestproject/hst:prototypepages").remove();
session.save();
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/a10bba45e553212b1ddf36e7828b4439fe66440b
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] CMS-10820 Remove usage and dependency on root node SNS support (unit-tests only)
Ate Douma pushed to branch master at cms-community / hippo-cms
Commits:
d4ce9dcd by Ate Douma at 2017-07-04T11:02:53+02:00
CMS-10820 Remove usage and dependency on root node SNS support (unit-tests only)
- - - - -
1 changed file:
- test/src/test/java/org/hippoecm/frontend/model/event/ObservationTest.java
Changes:
=
test/src/test/java/org/hippoecm/frontend/model/event/ObservationTest.java
=
--- a/test/src/test/java/org/hippoecm/frontend/model/event/ObservationTest.java
+++ b/test/src/test/java/org/hippoecm/frontend/model/event/ObservationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2017 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -226,13 +226,17 @@ public class ObservationTest extends PluginTest {
// after unregistering, no events should be received
-root.addNode("test", "nt:unstructured");
+root.addNode("test2", "nt:unstructured");
session.save();
Thread.sleep(1000);
home.processEvents();
assertEquals(1, events.size());
+
+// cleanup
+root.getNode("test2").remove();
+session.save();
}
@Test
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/d4ce9dcdc512b03d9b30e1b0cb018bb0bf1f3005
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][master] REPO-1718 Fixed constructor signature
Sergey Shepelevich pushed to branch master at cms-community / hippo-repository
Commits:
ab8513b3 by Sergey Shepelevich at 2017-07-04T09:54:21+02:00
REPO-1718 Fixed constructor signature
- - - - -
1 changed file:
- engine/src/main/java/org/onehippo/cm/engine/ConfigurationContentService.java
Changes:
=
engine/src/main/java/org/onehippo/cm/engine/ConfigurationContentService.java
=
---
a/engine/src/main/java/org/onehippo/cm/engine/ConfigurationContentService.java
+++
b/engine/src/main/java/org/onehippo/cm/engine/ConfigurationContentService.java
@@ -58,7 +58,7 @@ public class ConfigurationContentService {
private final JcrContentProcessor contentProcessingService;
private final ConfigurationBaselineService configurationBaselineService;
-ConfigurationContentService(final ConfigurationBaselineService
configurationBaselineService, JcrContentProcessor contentProcessingService) {
+ConfigurationContentService(final ConfigurationBaselineService
configurationBaselineService, final JcrContentProcessor
contentProcessingService) {
this.configurationBaselineService = configurationBaselineService;
this.contentProcessingService = contentProcessingService;
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/ab8513b35a4382846c4d9112c1014d914f08b172
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
