This closes #819
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/001730b8 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/001730b8 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/001730b8 Branch: refs/heads/master Commit: 001730b864f5e371cb3a80f9399be29762de30ad Parents: 7a434e3 98297ce Author: Duncan Godwin <[email protected]> Authored: Fri Sep 15 12:41:56 2017 +0100 Committer: Duncan Godwin <[email protected]> Committed: Fri Sep 15 12:41:56 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/core/entity/AbstractEntity.java | 6 +- .../apache/brooklyn/core/entity/Attributes.java | 10 +- .../core/entity/BrooklynConfigKeys.java | 124 ++++++++++++++----- .../enricher/stock/AbstractAggregator.java | 37 ++++-- .../enricher/stock/AbstractTransformer.java | 22 ++-- .../brooklyn/enricher/stock/Aggregator.java | 15 ++- .../brooklyn/enricher/stock/Combiner.java | 33 +++-- .../apache/brooklyn/enricher/stock/Joiner.java | 17 ++- .../brooklyn/enricher/stock/MapAggregator.java | 11 +- .../enricher/stock/PercentageEnricher.java | 7 +- .../brooklyn/enricher/stock/Transformer.java | 23 +++- .../brooklyn/enricher/stock/UpdatingMap.java | 23 +++- .../YamlRollingTimeWindowMeanEnricher.java | 13 +- .../stock/YamlTimeWeightedDeltaEnricher.java | 7 +- .../enricher/stock/reducer/Reducer.java | 26 ++-- .../brooklyn/entity/group/AbstractGroup.java | 13 +- .../apache/brooklyn/entity/group/Cluster.java | 2 + .../brooklyn/entity/group/DynamicCluster.java | 21 +++- .../brooklyn/entity/group/DynamicFabric.java | 23 +++- .../brooklyn/entity/group/DynamicGroup.java | 6 +- .../brooklyn/entity/stock/BasicStartable.java | 6 +- .../brooklyn/entity/stock/DelegateEntity.java | 7 +- core/src/main/resources/catalog.bom | 55 +++++++- .../init/src/main/resources/catalog-classes.bom | 105 ++++++++++++++-- .../policy/autoscaling/AutoScalerPolicy.java | 21 +++- .../policy/ha/ConnectionFailureDetector.java | 14 ++- .../policy/ha/ServiceFailureDetector.java | 12 +- .../brooklyn/policy/ha/ServiceReplacer.java | 20 ++- .../brooklyn/policy/ha/ServiceRestarter.java | 16 ++- .../policy/ha/SshMachineFailureDetector.java | 4 +- policy/src/main/resources/catalog.bom | 77 +++++++----- .../resources/EntityConfigResourceTest.java | 2 +- .../apache/brooklyn/entity/java/UsesJava.java | 10 +- .../apache/brooklyn/entity/java/UsesJmx.java | 37 ++++-- .../software/base/AbstractVanillaProcess.java | 21 +++- .../entity/software/base/SoftwareProcess.java | 37 +++--- .../software/base/SoftwareProcessImpl.java | 1 - .../software/base/VanillaSoftwareProcess.java | 3 - .../base/VanillaSoftwareProcessSshDriver.java | 12 +- .../software/base/VanillaWindowsProcess.java | 22 ++-- software/base/src/main/resources/catalog.bom | 15 ++- test-framework/src/main/resources/catalog.bom | 10 ++ 42 files changed, 714 insertions(+), 232 deletions(-) ----------------------------------------------------------------------
