[HippoCMS-scm] [Git][cms-community/hippo-configuration-management][master] HCM-240 Fix copyright year (again, this time for real)
Peter Centgraf pushed to branch master at cms-community / hippo-configuration-management Commits: 6cccbfea by Peter Centgraf at 2018-02-08T21:36:04+01:00 HCM-240 Fix copyright year (again, this time for real) - - - - - 2 changed files: - model/src/main/java/org/onehippo/cm/model/parser/ActionListParser.java - model/src/test/java/org/onehippo/cm/model/parser/ActionListParserTest.java Changes: = model/src/main/java/org/onehippo/cm/model/parser/ActionListParser.java = --- a/model/src/main/java/org/onehippo/cm/model/parser/ActionListParser.java +++ b/model/src/main/java/org/onehippo/cm/model/parser/ActionListParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2017,2018 Hippo B.V. (http://www.onehippo.com) + * Copyright 2017-2018 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. = model/src/test/java/org/onehippo/cm/model/parser/ActionListParserTest.java = --- a/model/src/test/java/org/onehippo/cm/model/parser/ActionListParserTest.java +++ b/model/src/test/java/org/onehippo/cm/model/parser/ActionListParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2017,2018 Hippo B.V. (http://www.onehippo.com) + * Copyright 2017-2018 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-configuration-management/commit/6cccbfea2a5185b765404871ec519d305862fb1a --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-configuration-management/commit/6cccbfea2a5185b765404871ec519d305862fb1a 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
[HippoCMS-scm] [Git][cms-community/hippo-repository][master] REPO-1937 bump the index in the next loop
Ard Schrijvers pushed to branch master at cms-community / hippo-repository
Commits:
bff17130 by Ard Schrijvers at 2018-02-08T18:27:10+01:00
REPO-1937 bump the index in the next loop
(note this was at this moment not a real bug because uniqueIndexes always
contained just 1 value)
- - - - -
1 changed file:
- engine/src/main/java/org/onehippo/repository/lock/db/DbLockManager.java
Changes:
=
engine/src/main/java/org/onehippo/repository/lock/db/DbLockManager.java
=
--- a/engine/src/main/java/org/onehippo/repository/lock/db/DbLockManager.java
+++ b/engine/src/main/java/org/onehippo/repository/lock/db/DbLockManager.java
@@ -149,6 +149,7 @@ public class DbLockManager extends AbstractLockManager {
int index = 1;
for (String uniqueIndex : uniqueIndexes) {
statement.addBatch("CREATE UNIQUE INDEX " +
tableName + "_idx_"+index+" on " + tableName + "("+uniqueIndex+")");
+index++;
}
statement.setQueryTimeout(10);
statement.executeBatch();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/bff17130d6da91981a63bbfebbe966953b91e362
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/bff17130d6da91981a63bbfebbe966953b91e362
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
[HippoCMS-scm] [Git][cms-community/hippo-configuration-management][master] 6 commits: HCM-240 Include type in ActionItemImpl.hashCode() and equals()
Peter Centgraf pushed to branch master at cms-community /
hippo-configuration-management
Commits:
942071f3 by Peter Centgraf at 2017-12-29T10:08:27+01:00
HCM-240 Include type in ActionItemImpl.hashCode() and equals()
- - - - -
eb36465c by Peter Centgraf at 2018-02-06T17:07:16+01:00
HCM-240 Update ActionListParser to explicitly check path uniqueness
- - - - -
9c8785a1 by Peter Centgraf at 2018-02-06T17:22:59+01:00
HCM-240 Update copyright year on changed files
- - - - -
dd00260b by Peter Centgraf at 2018-02-08T18:20:30+01:00
HCM-240 merge master
- - - - -
7c962ae8 by Peter Centgraf at 2018-02-08T18:22:20+01:00
HCM-240 Update to use JcrPath in ActionListParser
- - - - -
d2ec5f86 by Peter Centgraf at 2018-02-08T18:22:57+01:00
HCM-240 reintegrate feature/HCM-240
- - - - -
3 changed files:
- model/src/main/java/org/onehippo/cm/model/impl/definition/ActionItemImpl.java
- model/src/main/java/org/onehippo/cm/model/parser/ActionListParser.java
- model/src/test/java/org/onehippo/cm/model/parser/ActionListParserTest.java
Changes:
=
model/src/main/java/org/onehippo/cm/model/impl/definition/ActionItemImpl.java
=
---
a/model/src/main/java/org/onehippo/cm/model/impl/definition/ActionItemImpl.java
+++
b/model/src/main/java/org/onehippo/cm/model/impl/definition/ActionItemImpl.java
@@ -49,12 +49,12 @@ public class ActionItemImpl implements ActionItem {
return false;
}
final ActionItem that = (ActionItem) o;
-return Objects.equals(path, that.getPath());
+return Objects.equals(type, that.getType()) && Objects.equals(path,
that.getPath());
}
@Override
public int hashCode() {
-return Objects.hash(path);
+return Objects.hash(path, type);
}
@Override
=
model/src/main/java/org/onehippo/cm/model/parser/ActionListParser.java
=
--- a/model/src/main/java/org/onehippo/cm/model/parser/ActionListParser.java
+++ b/model/src/main/java/org/onehippo/cm/model/parser/ActionListParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2017,2018 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.
@@ -16,6 +16,7 @@
package org.onehippo.cm.model.parser;
import java.io.InputStream;
+import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
@@ -25,6 +26,7 @@ import org.onehippo.cm.model.definition.ActionItem;
import org.onehippo.cm.model.definition.ActionType;
import org.onehippo.cm.model.impl.ModuleImpl;
import org.onehippo.cm.model.impl.definition.ActionItemImpl;
+import org.onehippo.cm.model.path.JcrPath;
import org.yaml.snakeyaml.nodes.MappingNode;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.nodes.NodeTuple;
@@ -67,12 +69,14 @@ public class ActionListParser extends AbstractBaseParser {
protected Set collectActionItems(final Node node) throws
ParserException {
final Set actionItems = new LinkedHashSet<>();
+final Set paths = new HashSet<>();
for (NodeTuple tuple : asTuples(node)) {
final String path = asPathScalar(tuple.getKeyNode(), true, false);
final ActionItem actionItem = asActionItem(tuple.getValueNode(),
path);
-if (!actionItems.add(actionItem)) {
-throw new RuntimeException(String.format("Duplicate items are
not allowed: %s", actionItem));
+if (!paths.add(actionItem.getPath())) {
+throw new ParserException(String.format("Duplicate paths are
not allowed in the same version: %s", actionItem.getPath()));
}
+actionItems.add(actionItem);
}
return actionItems;
}
@@ -81,7 +85,7 @@ public class ActionListParser extends AbstractBaseParser {
String action = asStringScalar(node);
ActionType type = ActionType.valueOf(StringUtils.upperCase(action));
if (type == ActionType.APPEND) {
-throw new RuntimeException("APPEND action type can't be specified
in action lists file");
+throw new ParserException("APPEND action type can't be specified
in action lists file");
}
return new ActionItemImpl(path, type);
}
=
model/src/test/java/org/onehippo/cm/model/parser/ActionListParserTest.java
=
--- a/model/src/test/java/org/onehippo/cm/model/parser/ActionListParserTest.java
+++ b/model/src/test/java/org/onehippo/cm/model/parser/ActionListParserTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2017,2018 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the
[HippoCMS-scm] [Git][cms-community/hippo-configuration-management][feature/HCM-240] 16 commits: HCM-241 Use singleton anonymous subclasses for JcrPaths.ROOT and ROOT_NAME…
Peter Centgraf pushed to branch feature/HCM-240 at cms-community / hippo-configuration-management Commits: 43988d05 by Peter Centgraf at 2017-12-29T10:37:31+01:00 HCM-241 Use singleton anonymous subclasses for JcrPaths.ROOT and ROOT_NAME instead of depending on instance equality - - - - - ef251990 by Peter Centgraf at 2017-12-29T17:33:42+01:00 HCM-242 Various changes to make for a nicer public API and better general tidiness Organize imports ConfigSource and ContentSource interfaces with distinct convenience methods. Use generics to avoid casting, where possible Introduce TreeDefinition base class so that ContentDefinition and ConfigDefinition can be distinct types (not one a subclass of the other) Dont use default methods on interfaces Remove interface methods that are too implementation-specific - - - - - f8b2bbcc by Peter Centgraf at 2017-12-29T23:31:49+01:00 HCM-242 PropertyType - PropertyKind to avoid confusion with ValueType; ModelProperty.getValues() uses List? extends Value instead of Value[] - - - - - ab34631b by Peter Centgraf at 2018-01-02T13:53:32+01:00 HCM-242 Tweak spacing on API classes; ActionItem.getPath() uses JcrPath; remove Source.hasChangedSinceLoad() from API - - - - - a0438afb by Peter Centgraf at 2018-01-12T14:08:41+01:00 HCM-242 JcrPath API refactoring WIP - - - - - df9ece36 by Arent-Jan Banck at 2018-01-23T21:20:00+01:00 HCM-15 Update copyright year of NOTICE file to 2018 - - - - - a0fe181a by Peter Centgraf at 2018-01-29T17:28:13+01:00 HCM-242 Use JcrPath for all Node references; return Collection for ModelNode.getNodes() and getProperties() - - - - - 592b1aa6 by Peter Centgraf at 2018-02-06T17:12:44+01:00 HCM-241 merge master - - - - - 76d9d30e by Peter Centgraf at 2018-02-06T17:15:52+01:00 HCM-241 Update copyright year on changed files - - - - - 818608dc by Peter Centgraf at 2018-02-06T17:16:36+01:00 HCM-241 reintegrate feature/HCM-241 - - - - - b7a3543f by Peter Centgraf at 2018-02-07T13:00:44+01:00 HCM-242 merge master - - - - - 01744302 by Peter Centgraf at 2018-02-08T11:52:17+01:00 HCM-242 Update copyright year Also, remove some commented-out code - - - - - f9a0b862 by Peter Centgraf at 2018-02-08T13:03:33+01:00 HCM-242 Relax static types for HCM to avoid annoying wildcards in API - - - - - 872d2b3a by Peter Centgraf at 2018-02-08T17:54:03+01:00 HCM-242 reintegrate feature/HCM-242 - - - - - dd00260b by Peter Centgraf at 2018-02-08T18:20:30+01:00 HCM-240 merge master - - - - - 7c962ae8 by Peter Centgraf at 2018-02-08T18:22:20+01:00 HCM-240 Update to use JcrPath in ActionListParser - - - - - 30 changed files: - NOTICE - api/src/main/java/org/onehippo/cm/ConfigurationService.java - api/src/main/java/org/onehippo/cm/model/ConfigurationModel.java - api/src/main/java/org/onehippo/cm/model/Group.java - api/src/main/java/org/onehippo/cm/model/Module.java - api/src/main/java/org/onehippo/cm/model/OrderableByName.java - api/src/main/java/org/onehippo/cm/model/Project.java - api/src/main/java/org/onehippo/cm/model/definition/ActionItem.java - api/src/main/java/org/onehippo/cm/model/definition/ActionType.java - api/src/main/java/org/onehippo/cm/model/definition/ConfigDefinition.java - api/src/main/java/org/onehippo/cm/model/definition/ContentDefinition.java - api/src/main/java/org/onehippo/cm/model/definition/Definition.java - api/src/main/java/org/onehippo/cm/model/definition/NamespaceDefinition.java - + api/src/main/java/org/onehippo/cm/model/definition/TreeDefinition.java - api/src/main/java/org/onehippo/cm/model/definition/WebFileBundleDefinition.java - api/src/main/java/org/onehippo/cm/model/path/JcrPath.java - api/src/main/java/org/onehippo/cm/model/path/JcrPathSegment.java - + api/src/main/java/org/onehippo/cm/model/source/ConfigSource.java - + api/src/main/java/org/onehippo/cm/model/source/ContentSource.java - api/src/main/java/org/onehippo/cm/model/source/ResourceInputProvider.java - api/src/main/java/org/onehippo/cm/model/source/Source.java - api/src/main/java/org/onehippo/cm/model/source/SourceType.java - api/src/main/java/org/onehippo/cm/model/tree/ConfigurationItem.java - api/src/main/java/org/onehippo/cm/model/tree/ConfigurationItemCategory.java - api/src/main/java/org/onehippo/cm/model/tree/ConfigurationNode.java - api/src/main/java/org/onehippo/cm/model/tree/ConfigurationProperty.java - api/src/main/java/org/onehippo/cm/model/tree/DefinitionItem.java - api/src/main/java/org/onehippo/cm/model/tree/DefinitionNode.java - api/src/main/java/org/onehippo/cm/model/tree/DefinitionProperty.java - api/src/main/java/org/onehippo/cm/model/tree/ModelItem.java The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-configuration-management/compare/9c8785a1bd341e27e05828645055d278f38d07f5...7c962ae80874ac705bcf5e6ddd9a3b60ad6b33c9 --- View it on GitLab:
[HippoCMS-scm] [Git][cms-community/hippo-cms-l10n-tooling][master] 3 commits: CMS-11027 Refactor to match API cleanup in HCM-242
Peter Centgraf pushed to branch master at cms-community / hippo-cms-l10n-tooling
Commits:
a7808e73 by Peter Centgraf at 2018-01-29T17:35:45+01:00
CMS-11027 Refactor to match API cleanup in HCM-242
- - - - -
3461e7f6 by Peter Centgraf at 2018-02-08T11:53:07+01:00
CMS-11027 Update copyright year
- - - - -
1680ff09 by Peter Centgraf at 2018-02-08T18:09:28+01:00
CMS-11027 reintegrate feature/CMS-11027
- - - - -
2 changed files:
- tooling/src/main/java/org/onehippo/cms/l10n/RepositoryResourceBundle.java
-
tooling/src/main/java/org/onehippo/cms/l10n/RepositoryResourceBundleLoader.java
Changes:
=
tooling/src/main/java/org/onehippo/cms/l10n/RepositoryResourceBundle.java
=
--- a/tooling/src/main/java/org/onehippo/cms/l10n/RepositoryResourceBundle.java
+++ b/tooling/src/main/java/org/onehippo/cms/l10n/RepositoryResourceBundle.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2017-2018 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,16 +226,18 @@ public class RepositoryResourceBundle extends
ResourceBundle {
final ModuleImpl module = loadBundleModule(file);
-final List definitions =
module.getConfigSources().iterator().next().getDefinitions().stream().filter(d
-> d instanceof ConfigDefinitionImpl).map(d -> ((ConfigDefinitionImpl)
d).getNode()).filter(n ->
n.getPath().startsWith("/hippo:configuration")).collect(Collectors.toList());
+final List definitions =
module.getConfigSources().iterator().next()
+.getDefinitions().stream().filter(d -> d instanceof
ConfigDefinitionImpl)
+.map(d -> ((ConfigDefinitionImpl) d).getNode())
+.filter(n ->
n.getPath().startsWith("/hippo:configuration"))
+.collect(Collectors.toList());
for (DefinitionNodeImpl node : definitions) {
if (node.getPath().equals(bundlePath)) {
final DefinitionNodeImpl localeNode = node.getNode(locale);
if (localeNode != null) {
-Map properties =
localeNode.getProperties();
-for (String propName : properties.keySet()) {
-DefinitionPropertyImpl value =
properties.get(propName);
-if (!propName.equals(JCR_PRIMARY_TYPE)) {
-entries.put(propName,
value.getValue().getString());
+for (DefinitionPropertyImpl property :
localeNode.getProperties()) {
+if (!property.getName().equals(JCR_PRIMARY_TYPE)) {
+entries.put(property.getName(),
property.getValue().getString());
}
}
return;
=
tooling/src/main/java/org/onehippo/cms/l10n/RepositoryResourceBundleLoader.java
=
---
a/tooling/src/main/java/org/onehippo/cms/l10n/RepositoryResourceBundleLoader.java
+++
b/tooling/src/main/java/org/onehippo/cms/l10n/RepositoryResourceBundleLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2017-2018 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.
@@ -107,17 +107,17 @@ class RepositoryResourceBundleLoader extends
ResourceBundleLoader {
final Map entries = new HashMap<>();
if (node.getNodes().size() > 0) {
-for (Map.Entry nodeEntry :
node.getNodes().entrySet()) {
-path.push(nodeEntry.getKey());
-collectResourceBundles(nodeEntry.getValue(), fileName,
locales, path, bundles);
+for (DefinitionNodeImpl childNode : node.getNodes()) {
+path.push(childNode.getName());
+collectResourceBundles(childNode, fileName, locales, path,
bundles);
path.pop();
}
}
if (node.getProperties().size() > 0) {
-for (Map.Entry propertyEntry :
node.getProperties().entrySet()) {
-if (!propertyEntry.getKey().equals(JCR_PRIMARY_TYPE)) {
-entries.put(propertyEntry.getKey(),
propertyEntry.getValue().getValue().getString());
+for (DefinitionPropertyImpl property : node.getProperties()) {
+if (!property.getName().equals(JCR_PRIMARY_TYPE)) {
+entries.put(property.getName(),
property.getValue().getString());
}
}
}
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] 6 commits: CMS-11027 Refactor to match API cleanup in HCM-242
Peter Centgraf pushed to branch master at cms-community / hippo-cms
Commits:
4710a897 by Peter Centgraf at 2017-12-29T17:40:10+01:00
CMS-11027 Refactor to match API cleanup in HCM-242
- - - - -
0b05416e by Peter Centgraf at 2018-01-29T17:32:12+01:00
CMS-11027 Refactor to match API cleanup in HCM-242
- - - - -
d612e640 by Peter Centgraf at 2018-02-08T11:53:07+01:00
CMS-11027 Update copyright year
- - - - -
f1a9baa4 by Peter Centgraf at 2018-02-08T13:01:48+01:00
CMS-11027 Relax static types for HCM to avoid annoying wildcards in API
- - - - -
f4c2c08b by Peter Centgraf at 2018-02-08T17:58:47+01:00
CMS-11027 merge master
- - - - -
4ea5bf35 by Peter Centgraf at 2018-02-08T18:08:14+01:00
CMS-11027 reintegrate feature/CMS-11027
- - - - -
1 changed file:
-
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java
Changes:
=
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java
=
---
a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java
+++
b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2017 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2018 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.
@@ -43,6 +43,8 @@ import org.hippoecm.frontend.session.UserSession;
import org.onehippo.cm.ConfigurationService;
import org.onehippo.cm.model.ConfigurationModel;
import org.onehippo.cm.model.definition.ContentDefinition;
+import org.onehippo.cm.model.path.JcrPath;
+import org.onehippo.cm.model.path.JcrPaths;
import org.onehippo.cm.model.tree.ConfigurationItemCategory;
import org.onehippo.cm.model.tree.ConfigurationNode;
import org.onehippo.cm.model.tree.ConfigurationProperty;
@@ -147,7 +149,8 @@ public class PropertiesEditor extends DataView {
final String nodeOrigin = getNodeOrigin(nodePath, cfgModel);
final ConfigurationItemCategory propCat =
getCategoryForProperty(propertyPath, cfgModel);
-final ConfigurationProperty cfgProperty
= cfgModel.resolveProperty(propertyPath);
+final JcrPath propertyJcrPath = JcrPaths.getPath(propertyPath);
+final ConfigurationProperty cfgProperty =
cfgModel.resolveProperty(propertyJcrPath);
String origin = "";
if ((propCat.equals(ConfigurationItemCategory.CONFIG) ||
propCat.equals(ConfigurationItemCategory.SYSTEM))
&& cfgProperty != null) {
@@ -156,7 +159,7 @@ public class PropertiesEditor extends DataView {
// TODO: mark system-with-initial-value in a special way?
}
else if (propCat.equals(ConfigurationItemCategory.CONTENT)) {
-final ContentDefinition def = getNearestContentDef(propertyPath,
cfgModel);
+final ContentDefinition def =
cfgModel.getNearestContentDefinition(propertyJcrPath);
origin = (def==null)
? ""
: def.getOrigin();
@@ -176,14 +179,15 @@ public class PropertiesEditor extends DataView {
public static String getNodeOrigin(final String nodePath, final
ConfigurationModel cfgModel) {
final ConfigurationItemCategory nodeCat = getCategoryForNode(nodePath,
cfgModel);
String nodeOrigin = "";
+final JcrPath jcrPath = JcrPaths.getPath(nodePath);
if (nodeCat.equals(ConfigurationItemCategory.CONFIG)) {
-final ConfigurationNode cfgNode =
cfgModel.resolveNode(nodePath);
+final ConfigurationNode cfgNode = cfgModel.resolveNode(jcrPath);
nodeOrigin = (cfgNode==null)
? ""
:
cfgNode.getDefinitions().stream().map(ModelItem::getOrigin).collect(joining("\n"));
}
else if (nodeCat.equals(ConfigurationItemCategory.CONTENT)) {
-final ContentDefinition def = getNearestContentDef(nodePath,
cfgModel);
+final ContentDefinition def =
cfgModel.getNearestContentDefinition(jcrPath);
nodeOrigin = (def==null)
? ""
: def.getOrigin();
@@ -194,18 +198,6 @@ public class PropertiesEditor extends DataView {
return nodeOrigin;
}
-public static ContentDefinition getNearestContentDef(final String path,
final ConfigurationModel cfgModel) {
-String originPath = "";
-ContentDefinition defValue = null;
-for (ContentDefinition def : cfgModel.getContentDefinitions()) {
-if (path.startsWith(def.getRootPath()) &&
(def.getRootPath().length() > originPath.length())) {
-originPath = def.getRootPath();
-defValue = def;
-}
-}
-return defValue;
-}
-
/**
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/REPO-1914] 18 commits: REPO-1913 Improve logging and exception handling to make sure the cause is preserved
Peter Centgraf pushed to branch feature/REPO-1914 at cms-community / hippo-repository Commits: 305da3cd by Ard Schrijvers at 2018-01-03T11:46:44+01:00 REPO-1913 Improve logging and exception handling to make sure the cause is preserved - - - - - 075c95c1 by Ard Schrijvers at 2018-01-03T13:34:57+01:00 REPO-1915 Make sure to have latest jcr node states instead of possibly stale nodes Since the lock via the LockManager does not involve any jcr locking, it does *never* trigger a cluster sync. This means that we can get the lock for a node that has been processed and finished just by another cluster node that also already freed the lock again. Making sure that after we obtained the lock to invoke a session refresh should result in that #isPendingTrigger returns false if another cluster node already did process the job. - - - - - 77fca1aa by Ard Schrijvers at 2018-01-03T13:44:55+01:00 REPO-1915 Make sure to have latest jcr node states instead of possibly stale nodes - - - - - f5f06d2c by Ard Schrijvers at 2018-01-03T15:59:06+01:00 REPO-1915 move refresh to try block - - - - - d9acdd02 by Ate Douma at 2018-01-03T16:18:25+01:00 REPO-1915 - Ensure/force cluster synchronization in case another instance just modified the configuration baseline - - - - - df32033d by Marijan Milicevic at 2018-01-11T11:16:19+01:00 REPO-1912 SecurityManager doesnt sanitize userId in case of external providers to get memberships - sanitize user id - - - - - 639467f9 by Ate Douma at 2018-01-12T16:12:50+01:00 REPO-1 correct (local h2 database only) schema prefix for journal and hippo_lock tables - - - - - 2d82cbed by Ate Douma at 2018-01-16T01:56:47+01:00 REPO-1920 [UpdateExecutor] Provide support for custom node selection/navigation - - - - - 48a7f040 by Jeroen Hoffman at 2018-01-16T12:05:31+01:00 REPO-1912 Merge branch master into bugfix/REPO-1912 - - - - - 260a816a by Jeroen Hoffman at 2018-01-16T12:16:09+01:00 REPO-1912 Reintegrate branch bugfix/REPO-1912 into master - - - - - 2767c692 by Arent-Jan Banck at 2018-01-23T21:44:32+01:00 REPO-1 Update copyright year of NOTICE file to 2018 - - - - - 038671f0 by Bert Leunis at 2018-02-01T13:12:10+01:00 REPO-1860 Reintegrate feature/create-content - - - - - 3472e690 by Ard Schrijvers at 2018-02-01T15:28:37+01:00 REPO-1 Correct the cms-testutils dependency usage In dependency mgt the cms-testutils has scope test. Downstream project relying on the hippo-repository-testutils however expect the cms-testutils to be transitively pulled in by hippo-repository-testutils. Hence I removed the scope for every cms-testutils usage and in hippo-repository-testutils I did set the scope to compile such that downstream projects get cms-testutils pulled in when they include hippo-repository-testutils (as test dependency) - - - - - 5d129a53 by Bert Leunis at 2018-02-02T09:28:21+01:00 REPO-1860 prepare restore original commit message - - - - - acc94e2a by Mathijs den Burger at 2018-02-02T09:37:14+01:00 REPO-1860 Add StringCodecService and a module that provides it The service populates a StringCodecFactory with dynamically loaded StringCodec classes. Customers can register a more locale-specific StringCodec class by adding more properties to /hippo:configuration/hippo:modules/stringcodec/hippo:moduleconfig (e.g. encoding.display.de for a German-specific encoder of display names). The StringCodecModuleConfig always registers a default identity codec under the null key, so the StringCodecServiceImpl can use the null key to retrieve the codec for identity encoding. Note: the original commit date of these changes was 20-10-2017. The original commit message got lost during a reintegration, so these changes merely restore the original commit messages. - - - - - 62f06ec0 by Bert Leunis at 2018-02-02T09:45:16+01:00 REPO-1860 Reintegrate feature/REPO-1860 - - - - - 5b8225ac by Ate Douma at 2018-02-05T20:30:40+01:00 REPO-1516: Supporting log level in groovy updater execution - - - - - aebe0c24 by Peter Centgraf at 2018-02-08T13:34:32+01:00 REPO-1914 merge master - - - - - 30 changed files: - NOTICE - api/pom.xml - api/src/main/java/org/hippoecm/repository/api/HippoNodeType.java - api/src/main/java/org/hippoecm/repository/api/StringCodec.java - + api/src/main/java/org/hippoecm/repository/api/StringCodecService.java - api/src/main/java/org/onehippo/repository/update/BaseNodeUpdateVisitor.java - builtin/pom.xml - deprecated/facetselectmirror/pom.xml - engine/pom.xml - engine/src/main/java/org/hippoecm/repository/quartz/JCRJobStore.java - engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java - engine/src/main/java/org/onehippo/cm/engine/ConfigurationBaselineService.java - engine/src/main/java/org/onehippo/cm/engine/ConfigurationServiceImpl.java - engine/src/main/java/org/onehippo/repository/update/UpdaterExecutionModule.java - engine/src/main/java/org/onehippo/repository/update/UpdaterExecutionReport.java -
[HippoCMS-scm] [Git][cms-community/hippo-configuration-management][master] 9 commits: HCM-242 Various changes to make for a nicer public API and better general tidiness
Peter Centgraf pushed to branch master at cms-community / hippo-configuration-management Commits: ef251990 by Peter Centgraf at 2017-12-29T17:33:42+01:00 HCM-242 Various changes to make for a nicer public API and better general tidiness Organize imports ConfigSource and ContentSource interfaces with distinct convenience methods. Use generics to avoid casting, where possible Introduce TreeDefinition base class so that ContentDefinition and ConfigDefinition can be distinct types (not one a subclass of the other) Dont use default methods on interfaces Remove interface methods that are too implementation-specific - - - - - f8b2bbcc by Peter Centgraf at 2017-12-29T23:31:49+01:00 HCM-242 PropertyType - PropertyKind to avoid confusion with ValueType; ModelProperty.getValues() uses List? extends Value instead of Value[] - - - - - ab34631b by Peter Centgraf at 2018-01-02T13:53:32+01:00 HCM-242 Tweak spacing on API classes; ActionItem.getPath() uses JcrPath; remove Source.hasChangedSinceLoad() from API - - - - - a0438afb by Peter Centgraf at 2018-01-12T14:08:41+01:00 HCM-242 JcrPath API refactoring WIP - - - - - a0fe181a by Peter Centgraf at 2018-01-29T17:28:13+01:00 HCM-242 Use JcrPath for all Node references; return Collection for ModelNode.getNodes() and getProperties() - - - - - b7a3543f by Peter Centgraf at 2018-02-07T13:00:44+01:00 HCM-242 merge master - - - - - 01744302 by Peter Centgraf at 2018-02-08T11:52:17+01:00 HCM-242 Update copyright year Also, remove some commented-out code - - - - - f9a0b862 by Peter Centgraf at 2018-02-08T13:03:33+01:00 HCM-242 Relax static types for HCM to avoid annoying wildcards in API - - - - - 872d2b3a by Peter Centgraf at 2018-02-08T17:54:03+01:00 HCM-242 reintegrate feature/HCM-242 - - - - - 30 changed files: - api/src/main/java/org/onehippo/cm/ConfigurationService.java - api/src/main/java/org/onehippo/cm/model/ConfigurationModel.java - api/src/main/java/org/onehippo/cm/model/Group.java - api/src/main/java/org/onehippo/cm/model/Module.java - api/src/main/java/org/onehippo/cm/model/OrderableByName.java - api/src/main/java/org/onehippo/cm/model/Project.java - api/src/main/java/org/onehippo/cm/model/definition/ActionItem.java - api/src/main/java/org/onehippo/cm/model/definition/ActionType.java - api/src/main/java/org/onehippo/cm/model/definition/ConfigDefinition.java - api/src/main/java/org/onehippo/cm/model/definition/ContentDefinition.java - api/src/main/java/org/onehippo/cm/model/definition/Definition.java - api/src/main/java/org/onehippo/cm/model/definition/NamespaceDefinition.java - + api/src/main/java/org/onehippo/cm/model/definition/TreeDefinition.java - api/src/main/java/org/onehippo/cm/model/definition/WebFileBundleDefinition.java - api/src/main/java/org/onehippo/cm/model/path/JcrPath.java - api/src/main/java/org/onehippo/cm/model/path/JcrPathSegment.java - + api/src/main/java/org/onehippo/cm/model/source/ConfigSource.java - + api/src/main/java/org/onehippo/cm/model/source/ContentSource.java - api/src/main/java/org/onehippo/cm/model/source/ResourceInputProvider.java - api/src/main/java/org/onehippo/cm/model/source/Source.java - api/src/main/java/org/onehippo/cm/model/source/SourceType.java - api/src/main/java/org/onehippo/cm/model/tree/ConfigurationItem.java - api/src/main/java/org/onehippo/cm/model/tree/ConfigurationItemCategory.java - api/src/main/java/org/onehippo/cm/model/tree/ConfigurationNode.java - api/src/main/java/org/onehippo/cm/model/tree/ConfigurationProperty.java - api/src/main/java/org/onehippo/cm/model/tree/DefinitionItem.java - api/src/main/java/org/onehippo/cm/model/tree/DefinitionNode.java - api/src/main/java/org/onehippo/cm/model/tree/DefinitionProperty.java - api/src/main/java/org/onehippo/cm/model/tree/ModelItem.java - api/src/main/java/org/onehippo/cm/model/tree/ModelNode.java The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-configuration-management/compare/818608dc17a14e1caf512d755859df5ec035066d...872d2b3a0dfbaf888278f573170db78e9eb29514 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-configuration-management/compare/818608dc17a14e1caf512d755859df5ec035066d...872d2b3a0dfbaf888278f573170db78e9eb29514 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
[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-10840] 64 commits: CMS-10015 made update editor left column resizable
Bert Leunis pushed to branch feature/CMS-10840 at cms-community / hippo-cms Commits: cccd9a62 by Jasper Floor at 2017-09-22T14:33:11+02:00 CMS-10015 made update editor left column resizable - - - - - ffe1091e by Michael Metternich at 2017-09-28T11:05:42+02:00 CMS-10923 Set create content development version - - - - - 0a7d2fcc by Michael Metternich at 2017-10-03T13:25:39+02:00 CMS-10923 Reintegrate master into feature/create-content - - - - - 47a7417c by Jasper Floor at 2017-10-04T14:41:25+02:00 CMS-10015 Merge master changes in feature/CMS-10015 - - - - - 363894bd by Bert Leunis at 2017-10-09T15:18:20+02:00 CMS-10015 make the whole left column resizable - - - - - fd0a962f by Bert Leunis at 2017-10-16T11:41:42+02:00 CMS-10015 no height calc necessary for tree; no grow on button - - - - - dc5cb349 by Mathijs den Burger at 2017-10-18T12:44:17+02:00 CMS-10923 Merge master changes into feature/create-content - - - - - cbc4c264 by Mathijs den Burger at 2017-10-18T12:45:07+02:00 CMS-10951 Code cleanup in CodecUtils - - - - - 34599b83 by Mathijs den Burger at 2017-10-18T16:22:02+02:00 CMS-10951 Code cleanup: remove redundant public modifier - - - - - 7aff00ac by Mathijs den Burger at 2017-10-18T16:27:44+02:00 CMS-10951 Use StringCodecService instead of the codecs config node The configuration of (possibly locale-specific) StringCodecs for encoding display names and node names has moved to the StringCodecService in the repository. The new configuration location is /hippo:configuration/hippo:modules/stringcodec/hippo:moduleconfig. Because the ISettingsService is public API, we still need to be able to provide a StringCodecFactory. Hence the ServicedStringCodecFactory, who does not lookup codecs in its own map but delegates lookups to the StringCodecService instead. - - - - - 98cdfa35 by Mathijs den Burger at 2017-10-20T12:21:24+02:00 CMS-10951 Make ServicedStringCodecFactory package-private No need to expose it more. - - - - - 3d4f0f9a by Mathijs den Burger at 2017-10-20T12:39:42+02:00 CMS-10951 Reintegrate feature/CC-CMS-10951 into feature/create-content - - - - - 8f5ed565 by Mathijs den Burger at 2017-10-27T14:54:34+02:00 CMS-10923 Merge master changes into feature/create-content - - - - - 4604053e by Bert Leunis at 2017-11-21T10:48:40+01:00 CMS-10015 Merge master changes in feature/CMS-10015 - - - - - 494da7f5 by Bert Leunis at 2017-11-21T12:00:25+01:00 CMS-10015 Hide vertical scroll bar in Edge - - - - - 1d07af89 by Michael Metternich at 2017-11-28T10:44:19+01:00 CMS-10923 Merge master into create-content - - - - - f5ae5cf2 by Ard Schrijvers at 2017-11-29T10:18:58+01:00 CMS-11002 Fix obvious NPE possibility - - - - - 7110516f by Arent-Jan Banck at 2017-11-29T12:18:58+01:00 CMS-11005 Use CKEDitor 4.7.1-h12.1.0 - - - - - 55debee2 by Ate Douma at 2017-11-29T15:43:14+01:00 CMS-10813 Fix non-serializable problem with ConfigurationService instance - - - - - d2d0ec34 by Michael Metternich at 2017-11-30T10:49:47+01:00 CMS-10923 Merge master into feature/create-content - - - - - f85c6dab by Arent-Jan Banck at 2017-12-07T23:29:09+01:00 CMS-11019 Remove println statement and remove xerces from the performance test - - - - - 22da7e3b by Arent-Jan Banck at 2017-12-07T23:34:15+01:00 CMS-11019 Remove testPerformance. It was never executed as the html was invalid and the dom parser throws an exception that is silently swallowed, test still passed successful. Even when fixed its not testing anything relevent, only that Dom parsing is slower than directly using a string. - - - - - 9e3db9cb by Bert Leunis at 2017-12-12T13:47:24+01:00 CMS-10864 restyling of search field in users panel - - - - - 99fc343b by Bert Leunis at 2017-12-12T16:09:28+01:00 CMS-10864 toggle icon and search term - - - - - eb207493 by Bert Leunis at 2017-12-14T10:56:22+01:00 CMS-10864 make SubmittingTextField accessible for other plugins - - - - - d29d14bc by Bert Leunis at 2017-12-14T10:56:59+01:00 CMS-10864 search can be done by enter or spy glass - - - - - cd6c5243 by Bert Leunis at 2017-12-14T13:10:32+01:00 CMS-10864 new SearchTermPanel, used in ListGroupsPanel - - - - - 17d9560a by Bert Leunis at 2017-12-14T13:50:53+01:00 CMS-10864 use search term panel in user list and set members panels - - - - - c0d60d53 by Bert Leunis at 2017-12-14T14:21:47+01:00 CMS-10864 remove spacing between table rows in set group members panel - - - - - 62cc9014 by Bert Leunis at 2017-12-14T14:26:19+01:00 CMS-10864 remove obsolete properties - - - - - 573bf679 by Bert Leunis at 2017-12-14T14:50:33+01:00 CMS-10864 improve generics - - - - - efb97fc0 by Bert Leunis at 2017-12-14T16:55:32+01:00 CMS-10862 results for user or group name case insensitive - - - - - bffdd96a by Bert Leunis at 2017-12-15T10:07:59+01:00 CMS-10864 clear search term when moving up in the bread crumb path - - - - - 39154935 by Bert Leunis at 2017-12-15T14:54:52+01:00 CMS-10864 improve userlist sorting - - - - - 3acd248d by Bert Leunis at 2017-12-15T15:05:47+01:00
[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch feature/REPO-1936
Michael Metternich pushed new branch feature/REPO-1936 at cms-community / hippo-repository --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/tree/feature/REPO-1936 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
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Deleted branch feature/HSTTWO-4236
Michael Metternich deleted branch feature/HSTTWO-4236 at cms-community / hippo-site-toolkit --- 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
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/HSTTWO-4236] HSTTWO-4236 Move migrator to repository engine
Michael Metternich pushed to branch feature/HSTTWO-4236 at cms-community /
hippo-site-toolkit
Commits:
893a7efa by Michael Metternich at 2018-02-08T16:40:12+01:00
HSTTWO-4236 Move migrator to repository engine
- - - - -
1 changed file:
- −
toolkit-resources/addon/repository/src/main/java/org/onehippo/cm/model/migrator/StringCodecMigrator.java
Changes:
=
toolkit-resources/addon/repository/src/main/java/org/onehippo/cm/model/migrator/StringCodecMigrator.java
deleted
=
---
a/toolkit-resources/addon/repository/src/main/java/org/onehippo/cm/model/migrator/StringCodecMigrator.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright 2018 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onehippo.cm.model.migrator;
-
-import javax.jcr.NamespaceException;
-import javax.jcr.Node;
-import javax.jcr.Property;
-import javax.jcr.PropertyIterator;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-
-import org.onehippo.cm.engine.migrator.ConfigurationMigrator;
-import org.onehippo.cm.engine.migrator.MigrationException;
-import org.onehippo.cm.engine.migrator.PostMigrator;
-import org.onehippo.cm.model.ConfigurationModel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@PostMigrator
-public class StringCodecMigrator implements ConfigurationMigrator {
-
-private static final Logger log =
LoggerFactory.getLogger(StringCodecMigrator.class);
-
-private static final String OLD_CODECS_CONFIGURATION_LOCATION =
"/hippo:configuration/hippo:frontend/cms/cms-services/settingsService/codecs";
-private static final String NEW_CODECS_CONFIGURATION_LOCATION =
"/hippo:configuration/hippo:modules/stringcodec/hippo:moduleconfig";
-private static final String NODE_CONFIGURATION_PARAMETER_PATTERN =
"encoding.node*";
-private static final String DISPLAY_CONFIGURATION_PARAMETER =
"encoding.display";
-private static final String HIPPO_CONFIGURATION = "/hippo:configuration";
-private static final String HIPPO_MODULECONFIG = "hippo:moduleconfig";
-
-@Override
-public boolean migrate(final Session session, final ConfigurationModel
configurationModel, final boolean autoExportEnabled) throws RepositoryException
{
-try {
-return doMigrate(session, configurationModel, autoExportEnabled);
-} catch (final RepositoryException e) {
-throw new MigrationException("StringCodecMigrator failed.", e);
-}
-}
-
-private boolean doMigrate(final Session session, final ConfigurationModel
configurationModel, final boolean autoExportEnabled) throws RepositoryException
{
-if (!shouldRun(session, autoExportEnabled)) {
-log.info("Node name is not configured :StringCodecMigrator does
not need to do anything.");
-return false;
-}
-
-final boolean success = migrateStringCodecConfiguration(session);
-if (!success) {
-throw new MigrationException("Could not migrate configuration for
migrator StringCodecMigrator");
-}
-
-session.save();
-
-return true;
-}
-
-private boolean shouldRun(final Session session, final boolean
autoExportEnabled) throws RepositoryException {
-try {
-if (hasConfigurationProperties(session) && autoExportEnabled) {
-log.info("{} will run because node name is configured.", this);
-return true;
-}
-} catch (final NamespaceException ignore) {
-log.info("String codec has not been configured, nothing to
migrate.");
-return false;
-}
-return false;
-}
-
-private static boolean hasConfigurationProperties(final Session session)
throws RepositoryException {
-final boolean oldConfigLocationExists =
session.nodeExists(OLD_CODECS_CONFIGURATION_LOCATION);
-if (oldConfigLocationExists) {
-final Node node =
session.getNode(OLD_CODECS_CONFIGURATION_LOCATION);
-return node.hasProperty(DISPLAY_CONFIGURATION_PARAMETER) ||
-
node.getProperties(NODE_CONFIGURATION_PARAMETER_PATTERN).getSize() > 0;
-}
-return false;
-}
-
-private boolean migrateStringCodecConfiguration(final Session session)
throws RepositoryException {
-final Node oldConfigLocation =
[HippoCMS-scm] [Git][cms-community/hippo-services-webfiles][feature/msdts] CMS-11072 Artifact version change
Sergey Shepelevich pushed to branch feature/msdts at cms-community / hippo-services-webfiles Commits: 4cc089e5 by Sergey Shepelevich at 2018-02-08T15:23:05+01:00 CMS-11072 Artifact version change - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 2.5 2.6 5.2.0-SNAPSHOT -4.2.0-SNAPSHOT +4.2.0-msdts-SNAPSHOT 3.1.6 4.11 View it on GitLab: https://code.onehippo.org/cms-community/hippo-services-webfiles/commit/4cc089e59a005b4349328401c00dace68a6bdc5c --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-services-webfiles/commit/4cc089e59a005b4349328401c00dace68a6bdc5c 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CHANNELMGR-1707
Arthur Bogaart pushed new branch feature/CHANNELMGR-1707 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1707 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
[HippoCMS-scm] [Git][cms-community/hippo-configuration-management][feature/msdts] HCM-251 Artifact version change
Sergey Shepelevich pushed to branch feature/msdts at cms-community / hippo-configuration-management Commits: c8820dd8 by Sergey Shepelevich at 2018-02-08T15:03:15+01:00 HCM-251 Artifact version change - - - - - 4 changed files: - api/pom.xml - migration/pom.xml - model/pom.xml - pom.xml Changes: = api/pom.xml = --- a/api/pom.xml +++ b/api/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms hippo-configuration-management -1.2.0-SNAPSHOT +1.2.0-msdts-SNAPSHOT Hippo Configuration Management API = migration/pom.xml = --- a/migration/pom.xml +++ b/migration/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms hippo-configuration-management -1.2.0-SNAPSHOT +1.2.0-msdts-SNAPSHOT Hippo Configuration Management Migration = model/pom.xml = --- a/model/pom.xml +++ b/model/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms hippo-configuration-management -1.2.0-SNAPSHOT +1.2.0-msdts-SNAPSHOT Hippo Configuration Management Model @@ -88,9 +88,7 @@ process-test-resources - + = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.onehippo.cms hippo-configuration-management - 1.2.0-SNAPSHOT + 1.2.0-msdts-SNAPSHOT View it on GitLab: https://code.onehippo.org/cms-community/hippo-configuration-management/commit/c8820dd88ca44a370a6f8be030231c9300bfc020 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-configuration-management/commit/c8820dd88ca44a370a6f8be030231c9300bfc020 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
[HippoCMS-scm] [Git][cms-community/hippo-services-api][feature/msdts] CMS-11072 Artifact version change
Sergey Shepelevich pushed to branch feature/msdts at cms-community / hippo-services-api Commits: 2a7bacb7 by Sergey Shepelevich at 2018-02-08T15:02:54+01:00 CMS-11072 Artifact version change - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ Hippo CMS7 Services hippo-services - 4.2.0-SNAPSHOT + 4.2.0-msdts-SNAPSHOT 2012 View it on GitLab: https://code.onehippo.org/cms-community/hippo-services-api/commit/2a7bacb7448e349a697c8cc9572420353bbd789b --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-services-api/commit/2a7bacb7448e349a697c8cc9572420353bbd789b 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
[HippoCMS-scm] [Git][cms-community/hippo-services-webfiles][feature/msdts] CMS-11072 Artifact version change
Sergey Shepelevich pushed to branch feature/msdts at cms-community / hippo-services-webfiles Commits: 894cd63a by Sergey Shepelevich at 2018-02-08T15:02:37+01:00 CMS-11072 Artifact version change - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ Hippo CMS7 Services - webfiles hippo-services-webfiles - 4.2.0-SNAPSHOT + 4.2.0-msdts-SNAPSHOT 2014 View it on GitLab: https://code.onehippo.org/cms-community/hippo-services-webfiles/commit/894cd63afaa04f38c83d431d91c66bdfe4b857d5 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-services-webfiles/commit/894cd63afaa04f38c83d431d91c66bdfe4b857d5 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CHANNELMGR-1706
Bert Leunis pushed new branch feature/CHANNELMGR-1706 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1706 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
[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch feature/msdts
Sergey Shepelevich pushed new branch feature/msdts at cms-community / hippo-repository --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/tree/feature/msdts 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
[HippoCMS-scm] [Git][cms-community/hippo-configuration-management] Pushed new branch feature/msdts
Sergey Shepelevich pushed new branch feature/msdts at cms-community / hippo-configuration-management --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-configuration-management/tree/feature/msdts 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
[HippoCMS-scm] [Git][cms-community/hippo-services-webfiles] Pushed new branch feature/msdts
Sergey Shepelevich pushed new branch feature/msdts at cms-community / hippo-services-webfiles --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-services-webfiles/tree/feature/msdts 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
[HippoCMS-scm] [Git][cms-community/hippo-services-api] Pushed new branch feature/msdts
Sergey Shepelevich pushed new branch feature/msdts at cms-community / hippo-services-api --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-services-api/tree/feature/msdts 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
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/HSTTWO-4236] HSTTWO-4236 Minor code quality improvements
Michael Metternich pushed to branch feature/HSTTWO-4236 at cms-community /
hippo-site-toolkit
Commits:
34b746b5 by Michael Metternich at 2018-02-08T13:52:53+01:00
HSTTWO-4236 Minor code quality improvements
- - - - -
1 changed file:
-
toolkit-resources/addon/repository/src/main/java/org/onehippo/cm/model/migrator/StringCodecMigrator.java
Changes:
=
toolkit-resources/addon/repository/src/main/java/org/onehippo/cm/model/migrator/StringCodecMigrator.java
=
---
a/toolkit-resources/addon/repository/src/main/java/org/onehippo/cm/model/migrator/StringCodecMigrator.java
+++
b/toolkit-resources/addon/repository/src/main/java/org/onehippo/cm/model/migrator/StringCodecMigrator.java
@@ -22,7 +22,6 @@ import javax.jcr.PropertyIterator;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.jackrabbit.commons.JcrUtils;
import org.onehippo.cm.engine.migrator.ConfigurationMigrator;
import org.onehippo.cm.engine.migrator.MigrationException;
import org.onehippo.cm.engine.migrator.PostMigrator;
@@ -58,7 +57,7 @@ public class StringCodecMigrator implements
ConfigurationMigrator {
}
final boolean success = migrateStringCodecConfiguration(session);
-if(!success) {
+if (!success) {
throw new MigrationException("Could not migrate configuration for
migrator StringCodecMigrator");
}
@@ -82,7 +81,7 @@ public class StringCodecMigrator implements
ConfigurationMigrator {
private static boolean hasConfigurationProperties(final Session session)
throws RepositoryException {
final boolean oldConfigLocationExists =
session.nodeExists(OLD_CODECS_CONFIGURATION_LOCATION);
-if(oldConfigLocationExists) {
+if (oldConfigLocationExists) {
final Node node =
session.getNode(OLD_CODECS_CONFIGURATION_LOCATION);
return node.hasProperty(DISPLAY_CONFIGURATION_PARAMETER) ||
node.getProperties(NODE_CONFIGURATION_PARAMETER_PATTERN).getSize() > 0;
@@ -104,7 +103,7 @@ public class StringCodecMigrator implements
ConfigurationMigrator {
}
}
-if(oldConfigLocation.hasProperty(DISPLAY_CONFIGURATION_PARAMETER)) {
+if (oldConfigLocation.hasProperty(DISPLAY_CONFIGURATION_PARAMETER)) {
setNewProperty(newConfigLocation,
oldConfigLocation.getProperty(DISPLAY_CONFIGURATION_PARAMETER));
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/34b746b5f546d083d0aa9f59f0e9feab12e27641
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/34b746b5f546d083d0aa9f59f0e9feab12e27641
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
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Pushed new branch feature/HSTTWO-4236
Michael Metternich pushed new branch feature/HSTTWO-4236 at cms-community / hippo-site-toolkit --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/tree/feature/HSTTWO-4236 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
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/REPO-1914] REPO-1914 Relax static types for HCM to avoid annoying wildcards in API
Peter Centgraf pushed to branch feature/REPO-1914 at cms-community /
hippo-repository
Commits:
57dc2f73 by Peter Centgraf at 2018-02-08T13:03:48+01:00
REPO-1914 Relax static types for HCM to avoid annoying wildcards in API
- - - - -
3 changed files:
- engine/src/main/java/org/onehippo/cm/engine/ConfigurationConfigService.java
- engine/src/main/java/org/onehippo/cm/engine/JcrContentProcessor.java
- engine/src/main/java/org/onehippo/cm/engine/ValueProcessor.java
Changes:
=
engine/src/main/java/org/onehippo/cm/engine/ConfigurationConfigService.java
=
---
a/engine/src/main/java/org/onehippo/cm/engine/ConfigurationConfigService.java
+++
b/engine/src/main/java/org/onehippo/cm/engine/ConfigurationConfigService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2017-2018 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.
@@ -441,8 +441,8 @@ public class ConfigurationConfigService {
}
}
-private void computeAndWritePropertiesDelta(final ConfigurationNode
baselineNode,
-final ConfigurationNode
updateNode,
+private void computeAndWritePropertiesDelta(final ConfigurationNode
baselineNode,
+final ConfigurationNode
updateNode,
final Node targetNode,
final boolean isNew,
final boolean forceApply,
@@ -511,19 +511,16 @@ public class ConfigurationConfigService {
return names;
}
-private void computeAndWriteChildNodesDelta(final ConfigurationNode
baselineNode,
-final ConfigurationNode
updateNode,
+private void computeAndWriteChildNodesDelta(final ConfigurationNode
baselineNode,
+final ConfigurationNode
updateNode,
final Node targetNode,
final boolean forceApply,
final
List unprocessedReferences)
throws RepositoryException, IOException {
-//final Map updateChildren =
updateNode.getNodes();
-//final Map baselineChildren =
baselineNode.getNodes();
-
// Add or update child nodes
-for (final ConfigurationNode updateChild :
updateNode.getNodes()) {
+for (final ConfigurationNode updateChild : updateNode.getNodes()) {
final JcrPathSegment nameAndIndex =
updateChild.getJcrName().forceIndex();
ConfigurationNode baselineChild =
baselineNode.getNode(nameAndIndex);
final Node existingChildNode = getChildWithIndex(targetNode,
nameAndIndex.getName(), nameAndIndex.getIndex());
=
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
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2017-2018 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.
@@ -223,7 +223,7 @@ public class JcrContentProcessor {
}
}
-private void applyChildNodes(final DefinitionNode modelNode, final
Node jcrNode, final ActionType actionType,
+private void applyChildNodes(final DefinitionNode modelNode, final Node
jcrNode, final ActionType actionType,
final Collection> unprocessedReferences) throws RepositoryException, IOException {
log.debug(String.format("processing node '%s' defined in %s.",
modelNode.getPath(), modelNode.getOrigin()));
for (final DefinitionNode modelChild : modelNode.getNodes()) {
@@ -273,7 +273,7 @@ public class JcrContentProcessor {
return modelNode.getProperty(JCR_PRIMARYTYPE).getValue().getString();
}
-private void applyProperties(final DefinitionNode source, final Node
targetNode,
+private void applyProperties(final DefinitionNode source, final Node
targetNode,
final Collection> unprocessedReferences)
throws RepositoryException, IOException {
applyPrimaryAndMixinTypes(source, targetNode);
@@ -293,7 +293,7 @@ public class JcrContentProcessor {
[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-11027] CMS-11027 Relax static types for HCM to avoid annoying wildcards in API
Peter Centgraf pushed to branch feature/CMS-11027 at cms-community / hippo-cms
Commits:
f1a9baa4 by Peter Centgraf at 2018-02-08T13:01:48+01:00
CMS-11027 Relax static types for HCM to avoid annoying wildcards in API
- - - - -
1 changed file:
-
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java
Changes:
=
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java
=
---
a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java
+++
b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java
@@ -150,7 +150,7 @@ public class PropertiesEditor extends DataView {
final ConfigurationItemCategory propCat =
getCategoryForProperty(propertyPath, cfgModel);
final JcrPath propertyJcrPath = JcrPaths.getPath(propertyPath);
-final ConfigurationProperty cfgProperty =
cfgModel.resolveProperty(propertyJcrPath);
+final ConfigurationProperty cfgProperty =
cfgModel.resolveProperty(propertyJcrPath);
String origin = "";
if ((propCat.equals(ConfigurationItemCategory.CONFIG) ||
propCat.equals(ConfigurationItemCategory.SYSTEM))
&& cfgProperty != null) {
@@ -181,7 +181,7 @@ public class PropertiesEditor extends DataView {
String nodeOrigin = "";
final JcrPath jcrPath = JcrPaths.getPath(nodePath);
if (nodeCat.equals(ConfigurationItemCategory.CONFIG)) {
-final ConfigurationNode cfgNode =
cfgModel.resolveNode(jcrPath);
+final ConfigurationNode cfgNode = cfgModel.resolveNode(jcrPath);
nodeOrigin = (cfgNode==null)
? ""
:
cfgNode.getDefinitions().stream().map(ModelItem::getOrigin).collect(joining("\n"));
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/f1a9baa402e11b4ef23168ebab25f6c1b3f82573
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/f1a9baa402e11b4ef23168ebab25f6c1b3f82573
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
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] ESSENTIALS-604 Move too immature folder picker out of SDK API.
Tobias Jeger pushed to branch master at cms-community / hippo-essentials
Commits:
610eb0f8 by Tobias Jeger at 2018-02-08T12:40:35+01:00
ESSENTIALS-604 Move too immature folder picker out of SDK API.
- - - - -
3 changed files:
-
plugin-sdk/api/src/main/resources/META-INF/resources/dashboard/api/templates/essentials-folder-picker.html
→ dashboard/src/main/webapp/directives/essentials-folder-picker.html
- dashboard/src/main/webapp/js/directives.js
-
plugin-sdk/api/src/main/resources/META-INF/resources/dashboard/api/directives.js
Changes:
=
plugin-sdk/api/src/main/resources/META-INF/resources/dashboard/api/templates/essentials-folder-picker.html
→ dashboard/src/main/webapp/directives/essentials-folder-picker.html
=
=
dashboard/src/main/webapp/js/directives.js
=
--- a/dashboard/src/main/webapp/js/directives.js
+++ b/dashboard/src/main/webapp/js/directives.js
@@ -224,5 +224,73 @@
$scope.hasMessages = !!$scope.plugin.packageFile;
}
};
+}).directive("essentialsFolderPicker", function () {
+return {
+replace: false,
+restrict: 'E',
+scope: {
+title: '@',
+buttonText: '@',
+selectedPath: '=',
+selected: '='
+},
+templateUrl: 'directives/essentials-folder-picker.html',
+controller: function ($scope, $uibModal, $log, $http) {
+$scope.open = function (size) {
+var modalInstance = $uibModal.open({
+templateUrl: 'tree-picker.html',
+controller: ModalInstanceCtrl,
+size: size,
+resolve: {
+title: function () {
+return $scope.title;
+}, buttonText: function () {
+return $scope.buttonText;
+}, selectedPath: function () {
+return $scope.selectedPath;
+}, selected: function () {
+return $scope.selected;
+}
+}
+
+});
+modalInstance.result.then(function (selected) {
+if (selected) {
+$scope.selected = selected;
+$scope.selectedPath = selected.id;
+}
+});
+};
+
+var ModalInstanceCtrl = function ($scope,
$uibModalInstance, title) {
+$scope.title = title;
+$http.get(window.SERVER_URL +
'/essentials/rest/jcrbrowser/folders').success(function (data) {
+$scope.treeItems = data.items;
+});
+$scope.ok = function () {
+$uibModalInstance.close($scope.selected);
+};
+$scope.cancel = function () {
+$uibModalInstance.dismiss('cancel');
+};
+$scope.callbacks = {
+accept: function () {
+// disable drag/drop stuff
+return false;
+},
+dragStart: function (event) {
+$scope.selected =
event.source.nodeScope.$modelValue;
+$scope.selectedPath = $scope.selected.id;
+},
+dragStop: function (event) {
+// noop
+},
+dropped: function (event) {
+// noop
+}
+};
+};
+}
+};
});
})();
=
plugin-sdk/api/src/main/resources/META-INF/resources/dashboard/api/directives.js
=
---
a/plugin-sdk/api/src/main/resources/META-INF/resources/dashboard/api/directives.js
+++
b/plugin-sdk/api/src/main/resources/META-INF/resources/dashboard/api/directives.js
@@ -59,74 +59,6 @@
}
}
};
-}).directive("essentialsFolderPicker", function () {
- return {
-replace: false,
-restrict: 'E',
-scope: {
- title: '@',
- buttonText: '@',
- selectedPath: '=',
-
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/REPO-1914] REPO-1914 Update copyright year
Peter Centgraf pushed to branch feature/REPO-1914 at cms-community /
hippo-repository
Commits:
e3fec71d by Peter Centgraf at 2018-02-08T11:54:22+01:00
REPO-1914 Update copyright year
- - - - -
3 changed files:
- engine/src/main/java/org/onehippo/cm/engine/ConfigurationContentService.java
-
engine/src/main/java/org/onehippo/cm/engine/autoexport/AutoExportConfigExporter.java
-
engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.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
@@ -253,7 +253,7 @@ public class ConfigurationContentService {
for (final ActionItem item : items) {
if (item.getType() == ActionType.DELETE) {
final JcrPath baseNodePath = item.getPath();
-if
(ConfigurationModelUtils.getCategoryForNode(baseNodePath.toMinimallyIndexedPath().toString(),
model) == ConfigurationItemCategory.CONTENT) {
+if
(ConfigurationModelUtils.getCategoryForNode(baseNodePath.suppressIndices().toString(),
model) == ConfigurationItemCategory.CONTENT) {
log.debug("Processing delete action for node: {}",
baseNodePath);
final DefinitionNode deleteNode = new
DefinitionNodeImpl(baseNodePath,
=
engine/src/main/java/org/onehippo/cm/engine/autoexport/AutoExportConfigExporter.java
=
---
a/engine/src/main/java/org/onehippo/cm/engine/autoexport/AutoExportConfigExporter.java
+++
b/engine/src/main/java/org/onehippo/cm/engine/autoexport/AutoExportConfigExporter.java
@@ -17,8 +17,6 @@ package org.onehippo.cm.engine.autoexport;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -485,7 +483,7 @@ public class AutoExportConfigExporter extends
JcrContentExporter {
protected void checkDeletedContentChildren(final JcrPath deletedConfig)
throws RepositoryException {
for (final ContentDefinitionImpl contentDefinition :
configurationModel.getContentDefinitions()) {
final JcrPath contentRootPath =
contentDefinition.getNode().getJcrPath();
-final String contentRoot =
contentRootPath.toMinimallyIndexedPath().toString();
+final String contentRoot =
contentRootPath.suppressIndices().toString();
if (contentRootPath.startsWith(deletedConfig) &&
!deletedContent.matches(contentRoot)) {
// content root found as child of a deleted config path, which
itself, or a parent path, hasn't been recorded as deleted yet
deletedContent.removeChildren(contentRoot);
=
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
@@ -1095,7 +1095,7 @@ public class DefinitionMergeService {
protected static boolean shouldPathCreateNewSource(final JcrPath
incomingPath) {
// for the sake of creating new source files, we always want to use
the minimally-indexed path
// to avoid annoying and unnecessary "[1]" tags on filenames
-final String minimallyIndexedPath =
incomingPath.toMinimallyIndexedPath().toString();
+final String minimallyIndexedPath =
incomingPath.suppressIndices().toString();
return
JcrPaths.getPath(LocationMapper.contextNodeForPath(minimallyIndexedPath, true))
.equals(incomingPath);
}
@@ -1107,7 +1107,7 @@ public class DefinitionMergeService {
* @return a module-base-relative path with no leading slash for a
potentially new yaml source file
*/
protected String getFilePathByLocationMapper(JcrPath path) {
-String xmlFile =
LocationMapper.fileForPath(path.toMinimallyIndexedPath().toString(), true);
+String xmlFile =
LocationMapper.fileForPath(path.suppressIndices().toString(), true);
if (xmlFile == null) {
return "main.yaml";
}
@@ -1961,7 +1961,7 @@ public class DefinitionMergeService {
}
// if a delete path is -below- one of the sources that remains,
treat it as a change
for (final JcrPath sourceNodePath :
Sets.difference(existingSourcesByNodePath.keySet(), toRemoveByNodePath)) {
-if
(deletePath.startsWith(sourceNodePath.toMinimallyIndexedPath().toString())) {
+if
[HippoCMS-scm] [Git][cms-community/hippo-cms-l10n-tooling][feature/CMS-11027] CMS-11027 Update copyright year
Peter Centgraf pushed to branch feature/CMS-11027 at cms-community / hippo-cms-l10n-tooling Commits: 3461e7f6 by Peter Centgraf at 2018-02-08T11:53:07+01:00 CMS-11027 Update copyright year - - - - - 2 changed files: - tooling/src/main/java/org/onehippo/cms/l10n/RepositoryResourceBundle.java - tooling/src/main/java/org/onehippo/cms/l10n/RepositoryResourceBundleLoader.java Changes: = tooling/src/main/java/org/onehippo/cms/l10n/RepositoryResourceBundle.java = --- a/tooling/src/main/java/org/onehippo/cms/l10n/RepositoryResourceBundle.java +++ b/tooling/src/main/java/org/onehippo/cms/l10n/RepositoryResourceBundle.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Hippo B.V. (http://www.onehippo.com) + * Copyright 2017-2018 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. = tooling/src/main/java/org/onehippo/cms/l10n/RepositoryResourceBundleLoader.java = --- a/tooling/src/main/java/org/onehippo/cms/l10n/RepositoryResourceBundleLoader.java +++ b/tooling/src/main/java/org/onehippo/cms/l10n/RepositoryResourceBundleLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Hippo B.V. (http://www.onehippo.com) + * Copyright 2017-2018 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-cms-l10n-tooling/commit/3461e7f6b357a9c563bae803a7fd244d6f3726ec --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-l10n-tooling/commit/3461e7f6b357a9c563bae803a7fd244d6f3726ec 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
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new tag hippo-cms-2.24.23-SNAPSHOT
Peter Centgraf pushed new tag hippo-cms-2.24.23-SNAPSHOT at cms-community / hippo-cms --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/tree/hippo-cms-2.24.23-SNAPSHOT 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
[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-11027] CMS-11027 Update copyright year
Peter Centgraf pushed to branch feature/CMS-11027 at cms-community / hippo-cms Commits: d612e640 by Peter Centgraf at 2018-02-08T11:53:07+01:00 CMS-11027 Update copyright year - - - - - 1 changed file: - console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java Changes: = console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java = --- a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java +++ b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2017 Hippo B.V. (http://www.onehippo.com) + * Copyright 2008-2018 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-cms/commit/d612e6405552acdd420f319a7935f190c8f1fff4 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/d612e6405552acdd420f319a7935f190c8f1fff4 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
[HippoCMS-scm] [Git][cms-community/hippo-configuration-management][feature/HCM-242] 7 commits: HCM-241 Use singleton anonymous subclasses for JcrPaths.ROOT and ROOT_NAME…
Peter Centgraf pushed to branch feature/HCM-242 at cms-community / hippo-configuration-management Commits: 43988d05 by Peter Centgraf at 2017-12-29T10:37:31+01:00 HCM-241 Use singleton anonymous subclasses for JcrPaths.ROOT and ROOT_NAME instead of depending on instance equality - - - - - df9ece36 by Arent-Jan Banck at 2018-01-23T21:20:00+01:00 HCM-15 Update copyright year of NOTICE file to 2018 - - - - - 592b1aa6 by Peter Centgraf at 2018-02-06T17:12:44+01:00 HCM-241 merge master - - - - - 76d9d30e by Peter Centgraf at 2018-02-06T17:15:52+01:00 HCM-241 Update copyright year on changed files - - - - - 818608dc by Peter Centgraf at 2018-02-06T17:16:36+01:00 HCM-241 reintegrate feature/HCM-241 - - - - - b7a3543f by Peter Centgraf at 2018-02-07T13:00:44+01:00 HCM-242 merge master - - - - - 01744302 by Peter Centgraf at 2018-02-08T11:52:17+01:00 HCM-242 Update copyright year Also, remove some commented-out code - - - - - 30 changed files: - NOTICE - api/src/main/java/org/onehippo/cm/ConfigurationService.java - api/src/main/java/org/onehippo/cm/model/ConfigurationModel.java - api/src/main/java/org/onehippo/cm/model/Group.java - api/src/main/java/org/onehippo/cm/model/Module.java - api/src/main/java/org/onehippo/cm/model/OrderableByName.java - api/src/main/java/org/onehippo/cm/model/Project.java - api/src/main/java/org/onehippo/cm/model/definition/ActionItem.java - api/src/main/java/org/onehippo/cm/model/definition/ActionType.java - api/src/main/java/org/onehippo/cm/model/definition/ConfigDefinition.java - api/src/main/java/org/onehippo/cm/model/definition/ContentDefinition.java - api/src/main/java/org/onehippo/cm/model/definition/Definition.java - api/src/main/java/org/onehippo/cm/model/definition/NamespaceDefinition.java - api/src/main/java/org/onehippo/cm/model/definition/TreeDefinition.java - api/src/main/java/org/onehippo/cm/model/definition/WebFileBundleDefinition.java - api/src/main/java/org/onehippo/cm/model/path/JcrPath.java - api/src/main/java/org/onehippo/cm/model/path/JcrPathSegment.java - api/src/main/java/org/onehippo/cm/model/source/ConfigSource.java - api/src/main/java/org/onehippo/cm/model/source/ContentSource.java - api/src/main/java/org/onehippo/cm/model/source/ResourceInputProvider.java - api/src/main/java/org/onehippo/cm/model/source/Source.java - api/src/main/java/org/onehippo/cm/model/source/SourceType.java - api/src/main/java/org/onehippo/cm/model/tree/ConfigurationItemCategory.java - api/src/main/java/org/onehippo/cm/model/tree/ModelItem.java - api/src/main/java/org/onehippo/cm/model/tree/ModelNode.java - api/src/main/java/org/onehippo/cm/model/tree/ModelProperty.java - api/src/main/java/org/onehippo/cm/model/tree/PropertyKind.java - api/src/main/java/org/onehippo/cm/model/tree/PropertyOperation.java - api/src/main/java/org/onehippo/cm/model/tree/SourceLocation.java - api/src/main/java/org/onehippo/cm/model/tree/Value.java The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-configuration-management/compare/a0fe181ad714c64ba75ad85090be9e65b55f671e...0174430293be410ecdf935d79858da7d5b82a1f1 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-configuration-management/compare/a0fe181ad714c64ba75ad85090be9e65b55f671e...0174430293be410ecdf935d79858da7d5b82a1f1 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/projectdocs] CHANNELMGR-1717 Update translation with screen design
Michiel Eggermont pushed to branch feature/projectdocs at cms-community /
hippo-addon-channel-manager
Commits:
9afa32e8 by Michiel Eggermont at 2018-02-08T11:19:18+01:00
CHANNELMGR-1717 Update translation with screen design
- - - - -
1 changed file:
- frontend-ng/src/i18n/en.json
Changes:
=
frontend-ng/src/i18n/en.json
=
--- a/frontend-ng/src/i18n/en.json
+++ b/frontend-ng/src/i18n/en.json
@@ -117,7 +117,7 @@
"FEEDBACK_HELD_BY_CORE_PROJECT_MESSAGE": "Document has been edited on core",
"FEEDBACK_PROJECT_INVALID_STATE": "Document has project {{projectName}} in
invalid state {{projectState}}",
"FEEDBACK_PROJECT_NOT_FOUND": "Document has project id {{projectId}} which
does not exist (any more)",
- "FEEDBACK_PART_OF_PROJECT_MESSAGE": "Part of project '{{projectName}}'
({{projectState}})",
+ "FEEDBACK_PART_OF_PROJECT_MESSAGE": "Document is linked to project
'{{projectName}}' ({{projectState}})",
"FEEDBACK_NO_EDITABLE_CONTENT_MESSAGE": "This document can only be edited in
the content editor.",
"FEEDBACK_NOT_A_DOCUMENT_MESSAGE": "Only documents can be edited here.",
"FEEDBACK_NOT_A_DOCUMENT_TITLE": "Content not editable",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/9afa32e864d1e6400c6c5e055846a6c53cec68d4
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/9afa32e864d1e6400c6c5e055846a6c53cec68d4
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch bugfix/CHANNELMGR-1703
Arthur Bogaart deleted branch bugfix/CHANNELMGR-1703 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] 2 commits: CHANNELMGR-1703 Record own change after HstComponentService sets parameter
Arthur Bogaart pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
bee4c5e7 by Arthur Bogaart at 2018-02-06T23:36:28+01:00
CHANNELMGR-1703 Record own change after HstComponentService sets parameter
Moved the record-own-change call from the OverlayService to the
HstComponentService so it will simply be applied whenever the parameter is set,
in our case after creating or picking a document.
- - - - -
4fa30bcd by Arthur Bogaart at 2018-02-08T10:52:47+01:00
CHANNELMGR-1703 Reintegrate bugfix/CHANNELMGR-1703
- - - - -
3 changed files:
- frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.js
- frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js
- frontend-ng/src/app/services/hstComponent.service.js
Changes:
=
frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.js
=
--- a/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.js
+++ b/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.js
@@ -590,9 +590,6 @@ class OverlayService {
.then(() => {
this.PageStructureService.renderComponent(component.getId());
this.FeedbackService.showNotification('NOTIFICATION_DOCUMENT_SELECTED_FOR_COMPONENT',
{ componentName });
-
-// record own change to enable the publish button in the application
toolbar
-this.ChannelService.recordOwnChange();
})
.catch(() => {
this.FeedbackService.showError('ERROR_DOCUMENT_SELECTED_FOR_COMPONENT', {
componentName });
=
frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js
=
--- a/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js
+++ b/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js
@@ -569,7 +569,6 @@ describe('OverlayService', () => {
spyOn(HstComponentService, 'pickPath').and.returnValue($q.resolve());
spyOn(PageStructureService, 'renderComponent');
spyOn(FeedbackService, 'showNotification');
-spyOn(ChannelService, 'recordOwnChange');
loadIframeFixture(() => {
const overlayElementScenario5 =
iframe('.hippo-overlay-element-manage-content-link')[4];
@@ -585,7 +584,6 @@ describe('OverlayService', () => {
expect(FeedbackService.showNotification).toHaveBeenCalledWith('NOTIFICATION_DOCUMENT_SELECTED_FOR_COMPONENT',
{
componentName: 'component B',
});
- expect(ChannelService.recordOwnChange).toHaveBeenCalled();
done();
});
@@ -622,7 +620,6 @@ describe('OverlayService', () => {
spyOn(HstComponentService, 'pickPath').and.returnValue($q.resolve());
spyOn(PageStructureService, 'renderComponent');
spyOn(FeedbackService, 'showNotification');
-spyOn(ChannelService, 'recordOwnChange');
loadIframeFixture(() => {
const overlayElementScenario7 =
iframe('.hippo-overlay-element-manage-content-link')[6];
@@ -638,7 +635,6 @@ describe('OverlayService', () => {
expect(FeedbackService.showNotification).toHaveBeenCalledWith('NOTIFICATION_DOCUMENT_SELECTED_FOR_COMPONENT',
{
componentName: 'Component with experiment',
});
- expect(ChannelService.recordOwnChange).toHaveBeenCalled();
done();
});
=
frontend-ng/src/app/services/hstComponent.service.js
=
--- a/frontend-ng/src/app/services/hstComponent.service.js
+++ b/frontend-ng/src/app/services/hstComponent.service.js
@@ -21,6 +21,7 @@ class HstComponentService {
'ngInject';
this.$q = $q;
+this.ChannelService = ChannelService;
this.CmsService = CmsService;
this.HstService = HstService;
@@ -69,7 +70,8 @@ class HstComponentService {
// in the backend call, it must be URI-encoded to be parsed correctly by
the backend.
const encodedVariant = encodeURIComponent(componentVariant);
-return this.HstService.doPutForm(params, componentId, encodedVariant);
+return this.HstService.doPutForm(params, componentId, encodedVariant)
+ .then(() => this.ChannelService.recordOwnChange());
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/d473b16c0cbf9d727a6f061c86517f75158fe0c4...4fa30bcde10bda3e1af0fdbf10e408d1f37a00d9
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/d473b16c0cbf9d727a6f061c86517f75158fe0c4...4fa30bcde10bda3e1af0fdbf10e408d1f37a00d9
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
