This closes #483
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c4c615b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c4c615b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c4c615b1 Branch: refs/heads/master Commit: c4c615b10f89b67f3a25b832bfb4c152bdfe58d0 Parents: 4ae9407 9613dd1 Author: Alex Heneveld <[email protected]> Authored: Thu Jan 29 11:35:33 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Thu Jan 29 11:35:33 2015 +0000 ---------------------------------------------------------------------- .../java/brooklyn/entity/basic/ConfigKeys.java | 7 ++- .../brooklyn/entity/basic/EntityConfigMap.java | 50 +++++++++++++++++--- .../entity/basic/ServiceStateLogic.java | 16 +++++-- .../brooklyn/event/basic/BasicConfigKey.java | 50 +++++++++++++++++--- .../location/basic/AbstractLocation.java | 21 +++++++- .../location/basic/LocationInternal.java | 5 ++ .../basic/ConfigEntityInheritanceTest.java | 22 +++++++++ .../brooklyn/entity/basic/ConfigKeysTest.java | 27 +++++++++++ .../java/brooklyn/config/ConfigInheritance.java | 47 ++++++++++++++++++ .../main/java/brooklyn/config/ConfigKey.java | 7 +++ 10 files changed, 233 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
