This closes #705
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/45dd5494 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/45dd5494 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/45dd5494 Branch: refs/heads/master Commit: 45dd54940eda03abbfae1a356345fd4b52cca213 Parents: b08fe4e 8df4cdf Author: Alex Heneveld <[email protected]> Authored: Wed Jun 24 01:04:52 2015 -0700 Committer: Alex Heneveld <[email protected]> Committed: Wed Jun 24 01:04:52 2015 -0700 ---------------------------------------------------------------------- api/src/main/java/brooklyn/event/Sensor.java | 4 +- .../catalog/internal/BasicBrooklynCatalog.java | 3 +- .../main/java/brooklyn/enricher/Enrichers.java | 5 +- .../enricher/basic/AbstractAggregator.java | 32 +- .../enricher/basic/AbstractTransformer.java | 101 +++++ .../brooklyn/enricher/basic/Aggregator.java | 18 +- .../java/brooklyn/enricher/basic/Combiner.java | 1 - .../brooklyn/enricher/basic/Propagator.java | 5 +- .../brooklyn/enricher/basic/Transformer.java | 71 +--- .../YamlRollingTimeWindowMeanEnricher.java | 178 +++++++++ .../basic/YamlTimeWeightedDeltaEnricher.java | 81 ++++ .../brooklyn/entity/basic/BrooklynTaskTags.java | 7 +- .../entity/basic/ServiceStateLogic.java | 5 +- .../drivers/downloads/DownloadSubstituters.java | 4 +- .../rebind/PeriodicDeltaChangeListener.java | 3 +- .../event/basic/DependentConfiguration.java | 10 +- .../internal/LocalSubscriptionManager.java | 4 +- .../java/brooklyn/util/flags/TypeCoercions.java | 34 +- .../util/task/BasicExecutionContext.java | 5 + .../src/main/java/brooklyn/util/task/Tasks.java | 2 +- .../java/brooklyn/util/task/ValueResolver.java | 85 ++++- .../YamlRollingTimeWindowMeanEnricherTest.java | 178 +++++++++ .../YamlTimeWeightedDeltaEnricherTest.java | 107 ++++++ .../util/internal/TypeCoercionsTest.java | 2 +- .../jclouds/ComputeServiceRegistryImpl.java | 7 + .../location/jclouds/JcloudsLocation.java | 35 +- .../location/jclouds/JcloudsLocationConfig.java | 2 +- .../enricher/RollingTimeWindowMeanEnricher.java | 4 +- .../enricher/TimeWeightedDeltaEnricher.java | 3 + .../policy/autoscaling/AutoScalerPolicy.java | 26 +- .../policy/ha/AbstractFailureDetector.java | 4 +- .../brooklyn/policy/ha/ServiceRestarter.java | 3 +- .../policy/ha/SshMachineFailureDetector.java | 1 - .../basic/AbstractSoftwareProcessSshDriver.java | 2 +- .../basic/VanillaSoftwareProcessSshDriver.java | 3 +- .../effector/SelectMasterEffectorBody.java | 2 +- .../brooklyn/entity/software/StaticSensor.java | 33 +- .../entity/software/ssh/SshCommandEffector.java | 2 +- .../entity/software/ssh/SshCommandSensor.java | 2 +- .../nosql/couchbase/CouchbaseNodeSshDriver.java | 2 +- .../entity/proxy/AbstractControllerImpl.java | 141 +++---- .../entity/proxy/nginx/NginxControllerImpl.java | 2 +- .../BrooklynAssemblyTemplateInstantiator.java | 2 +- .../spi/creation/BrooklynEntityMatcher.java | 6 +- .../spi/dsl/methods/BrooklynDslCommon.java | 31 +- .../brooklyn/spi/dsl/methods/DslComponent.java | 25 +- usage/cli/pom.xml | 27 ++ usage/cli/src/main/java/brooklyn/cli/Main.java | 15 +- .../main/resources/brooklyn/default.catalog.bom | 378 +++++++++++++++++-- usage/dist/pom.xml | 79 ++-- .../main/config/build-distribution-archive.xml | 90 ----- .../src/main/config/build-distribution-dir.xml | 90 ----- .../dist/src/main/config/build-distribution.xml | 96 +++++ .../main/dist/conf/brooklyn/default.catalog.bom | 41 -- .../rest/resources/EntityConfigResource.java | 3 +- .../brooklyn/rest/resources/SensorResource.java | 3 +- .../rest/transform/CatalogTransformer.java | 27 +- .../rest/transform/EffectorTransformer.java | 5 +- .../java/brooklyn/util/repeat/Repeater.java | 7 + .../java/brooklyn/util/text/StringEscapes.java | 20 +- .../main/java/brooklyn/util/text/Strings.java | 28 +- .../main/java/brooklyn/util/time/Durations.java | 3 + .../src/main/java/brooklyn/util/yaml/Yamls.java | 10 +- .../test/java/brooklyn/util/yaml/YamlsTest.java | 20 + 64 files changed, 1690 insertions(+), 535 deletions(-) ----------------------------------------------------------------------
