Merge pull request #995 from aledsage/feature/EnricherSpec Adds EnricherSpec, and adds config to Enricher
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/be4ab784 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/be4ab784 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/be4ab784 Branch: refs/heads/0.6.0 Commit: be4ab7842a01fd5117bd4eb4c868379250b60e26 Parents: 3412487 0e74b12 Author: Aled Sage <[email protected]> Authored: Tue Nov 5 08:32:52 2013 -0800 Committer: Aled Sage <[email protected]> Committed: Tue Nov 5 08:32:52 2013 -0800 ---------------------------------------------------------------------- .../brooklyn/entity/proxying/EntitySpec.java | 41 +++- api/src/main/java/brooklyn/policy/Enricher.java | 31 ++- .../main/java/brooklyn/policy/EnricherSpec.java | 175 ++++++++++++++++ .../main/java/brooklyn/policy/EnricherType.java | 38 ++++ api/src/main/java/brooklyn/policy/Policy.java | 2 + .../main/java/brooklyn/policy/PolicyType.java | 2 +- .../enricher/basic/AbstractEnricher.java | 36 +--- .../entity/proxying/InternalEntityFactory.java | 10 + .../entity/proxying/InternalPolicyFactory.java | 71 ++++++- .../policy/basic/AbstractEntityAdjunct.java | 198 ++++++++++++++++++- .../brooklyn/policy/basic/AbstractPolicy.java | 156 +-------------- .../java/brooklyn/policy/basic/AdjunctType.java | 156 +++++++++++++++ .../brooklyn/policy/basic/ConfigMapImpl.java | 173 ++++++++++++++++ .../brooklyn/policy/basic/EnricherTypeImpl.java | 57 ++++++ .../brooklyn/policy/basic/PolicyConfigMap.java | 141 +------------ .../brooklyn/policy/basic/PolicyTypeImpl.java | 123 ++---------- .../brooklyn/entity/basic/EntitySpecTest.java | 42 +++- .../policy/basic/EnricherConfigTest.java | 167 ++++++++++++++++ .../brooklyn/policy/basic/EnricherTypeTest.java | 41 ++++ 19 files changed, 1226 insertions(+), 434 deletions(-) ----------------------------------------------------------------------
