This closes #595
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ff31a41d Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ff31a41d Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ff31a41d Branch: refs/heads/master Commit: ff31a41d463c8b5b0b52abdb66968dc9bdf2abdd Parents: 4338a8f b887c19 Author: Alex Heneveld <[email protected]> Authored: Fri Apr 17 09:34:37 2015 -0500 Committer: Alex Heneveld <[email protected]> Committed: Fri Apr 17 09:34:37 2015 -0500 ---------------------------------------------------------------------- .../brooklyn/entity/proxying/EntitySpec.java | 11 +- .../config/internal/AbstractConfigMapImpl.java | 111 ++++++++++++++++ .../main/java/brooklyn/enricher/Enrichers.java | 83 +++++++++++- .../enricher/basic/AbstractAggregator.java | 7 +- .../brooklyn/enricher/basic/Aggregator.java | 17 ++- .../java/brooklyn/enricher/basic/Joiner.java | 127 +++++++++++++++++++ .../brooklyn/enricher/basic/Propagator.java | 52 +++++--- .../brooklyn/enricher/basic/Transformer.java | 82 +++++++++--- .../brooklyn/entity/basic/EntityConfigMap.java | 59 +-------- .../brooklyn/entity/group/DynamicCluster.java | 5 + .../entity/group/DynamicClusterImpl.java | 5 +- .../basic/AbstractCollectionConfigKey.java | 16 ++- .../basic/AbstractStructuredConfigKey.java | 10 +- .../brooklyn/event/basic/BasicConfigKey.java | 9 +- .../java/brooklyn/event/basic/MapConfigKey.java | 33 ++++- .../event/basic/SubElementConfigKey.java | 28 +++- .../brooklyn/policy/basic/ConfigMapImpl.java | 73 +---------- .../src/main/java/brooklyn/util/task/Tasks.java | 1 - .../java/brooklyn/util/task/ValueResolver.java | 8 +- .../java/brooklyn/enricher/EnrichersTest.java | 67 ++++++++++ ...apListAndOtherStructuredConfigKeyTest.groovy | 60 ++++++++- .../entity/group/DynamicClusterTest.java | 52 ++++++++ ...est-app-with-enrichers-slightly-simpler.yaml | 57 +++++++++ docs/guide/yaml/yaml-reference.md | 35 +++-- .../spi/dsl/BrooklynDslInterpreter.java | 6 +- .../spi/dsl/methods/BrooklynDslCommon.java | 12 +- .../brooklyn/spi/dsl/methods/DslComponent.java | 35 +++++ .../camp/brooklyn/DslAndRebindYamlTest.java | 59 +++++++++ .../EnrichersSlightlySimplerYamlTest.java | 96 ++++++++++++++ .../camp/brooklyn/EntitiesYamlTest.java | 4 +- ...est-app-with-enrichers-slightly-simpler.yaml | 74 +++++++++++ .../brooklyn/util/text/StringPredicates.java | 22 ++++ 32 files changed, 1103 insertions(+), 213 deletions(-) ----------------------------------------------------------------------
