You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2017/03/02 17:01:53 UTC
[09/19] brooklyn-server git commit: Merge branch 'master' into
config-self-reference-fix
Merge branch 'master' into config-self-reference-fix
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3f3e3d67
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3f3e3d67
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3f3e3d67
Branch: refs/heads/master
Commit: 3f3e3d67936e3059a48a0659d1e82c54b95ff7d7
Parents: 72eff85 1104828
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Feb 15 18:58:30 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Feb 15 18:58:30 2017 +0000
----------------------------------------------------------------------
.../camp/brooklyn/AbstractYamlRebindTest.java | 26 +-
.../CompositeEffectorYamlRebindTest.java | 102 +++++++
.../brooklyn/CompositeEffectorYamlTest.java | 79 ++++++
.../HttpCommandEffectorYamlRebindTest.java | 92 +++++++
.../brooklyn/HttpCommandEffectorYamlTest.java | 79 ++++++
.../brooklyn/core/effector/AddSensor.java | 2 +
.../core/effector/CompositeEffector.java | 135 +++++++++
.../brooklyn/core/effector/Effectors.java | 4 +
.../core/effector/http/HttpCommandEffector.java | 209 ++++++++++++++
.../core/entity/EntityInitializers.java | 32 ++-
.../core/sensor/http/HttpRequestSensor.java | 47 ++--
.../CompositeEffectorIntegrationTest.java | 91 +++++++
.../core/effector/CompositeEffectorTest.java | 262 ++++++++++++++++++
.../HttpCommandEffectorIntegrationTest.java | 125 +++++++++
.../effector/http/HttpCommandEffectorTest.java | 272 +++++++++++++++++++
.../core/effector/http/int-response.json | 16 ++
.../core/effector/http/list-response.json | 19 ++
.../brooklyn/core/effector/http/login.json | 16 ++
.../core/effector/http/map-response.json | 16 ++
.../org/apache/brooklyn/core/effector/test.json | 16 ++
.../apache/brooklyn/rest/api/EffectorApi.java | 28 +-
.../brooklyn/util/time/DurationPredicates.java | 162 +++++++++++
.../util/time/DurationPredicatesTest.java | 150 ++++++++++
23 files changed, 1931 insertions(+), 49 deletions(-)
----------------------------------------------------------------------