You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/01/15 23:37:48 UTC
[4/5] incubator-brooklyn git commit: Merge pull request #1 from
aledsage/iyovcheva/externalised-config-in-catalog-definition-aled
Merge pull request #1 from aledsage/iyovcheva/externalised-config-in-catalog-definition-aled
Externalised config in catalog definition
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6e84d008
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6e84d008
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6e84d008
Branch: refs/heads/master
Commit: 6e84d008cb649ed0fb26b4b4e8f6d2a8c3721aef
Parents: 18cce24 4dbbc9c
Author: iyovcheva <iv...@gmail.com>
Authored: Tue Jan 12 10:21:39 2016 +0200
Committer: Ivana Yovcheva <iv...@gmail.com>
Committed: Tue Jan 12 12:02:12 2016 +0200
----------------------------------------------------------------------
.../camp/brooklyn/ExternalConfigYamlTest.java | 100 ++++++++++++++-----
.../catalog/internal/BasicBrooklynCatalog.java | 55 ++++++----
2 files changed, 112 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6e84d008/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------
diff --cc brooklyn-server/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
index 4f44dab,7e0b69e..81b273e
--- a/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
+++ b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
@@@ -378,7 -378,7 +378,7 @@@ public class BasicBrooklynCatalog imple
catalogMetadata.remove("items");
if (!itemDef.isEmpty()) {
log.debug("Reading brooklyn.catalog peer keys as item ('top-level syntax')");
- Map<String,Object> rootItem = MutableMap.of("item", (Object) itemDef);
- Map<String,?> rootItem = MutableMap.of("item", (Object) itemDef);
++ Map<String,?> rootItem = MutableMap.of("item", itemDef);
String rootItemYaml = yaml;
YamlExtract yamlExtract = Yamls.getTextOfYamlAtPath(rootItemYaml, "brooklyn.catalog");
String match = yamlExtract.withOriginalIndentation(true).withKeyIncluded(true).getMatchedYamlTextOrWarn();