Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5D1DF200C4F for ; Thu, 2 Mar 2017 18:01:47 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 589AF160B7A; Thu, 2 Mar 2017 17:01:47 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 93070160B85 for ; Thu, 2 Mar 2017 18:01:46 +0100 (CET) Received: (qmail 80437 invoked by uid 500); 2 Mar 2017 17:01:45 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 80275 invoked by uid 99); 2 Mar 2017 17:01:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Mar 2017 17:01:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9924BE95B8; Thu, 2 Mar 2017 17:01:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aledsage@apache.org To: commits@brooklyn.apache.org Date: Thu, 02 Mar 2017 17:01:53 -0000 Message-Id: <42cd7fa6fb6447e8b5b2d2abbb787fae@git.apache.org> In-Reply-To: <22e94266ecbb476981b84233cd766bbc@git.apache.org> References: <22e94266ecbb476981b84233cd766bbc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/19] brooklyn-server git commit: Merge branch 'master' into config-self-reference-fix archived-at: Thu, 02 Mar 2017 17:01:47 -0000 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 Authored: Wed Feb 15 18:58:30 2017 +0000 Committer: Alex Heneveld 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(-) ----------------------------------------------------------------------