Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 507B61799E for ; Tue, 11 Nov 2014 18:27:41 +0000 (UTC) Received: (qmail 68491 invoked by uid 500); 11 Nov 2014 18:27:37 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 68458 invoked by uid 500); 11 Nov 2014 18:27:37 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 68442 invoked by uid 99); 11 Nov 2014 18:27:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Nov 2014 18:27:37 +0000 X-ASF-Spam-Status: No, hits=-1999.6 required=5.0 tests=ALL_TRUSTED,HK_RANDOM_FROM,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 11 Nov 2014 18:27:36 +0000 Received: (qmail 60268 invoked by uid 99); 11 Nov 2014 18:24:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Nov 2014 18:24:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 44125A0D516; Tue, 11 Nov 2014 18:24:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: grkvlt@apache.org To: commits@brooklyn.incubator.apache.org Date: Tue, 11 Nov 2014 18:24:46 -0000 Message-Id: <72bf50f7b8dd40a6ae45f80742f51166@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-brooklyn git commit: Added location definition attribute to location owner X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-brooklyn Updated Branches: refs/heads/master 9352bbe90 -> bded2d9e5 Added location definition attribute to location owner Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0a1e0651 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0a1e0651 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0a1e0651 Branch: refs/heads/master Commit: 0a1e0651786106803c7ffc2ca340768a8c545e97 Parents: dc53cec Author: Matt Champion Authored: Thu Oct 23 17:53:54 2014 +0100 Committer: Matt Champion Committed: Tue Nov 11 09:34:54 2014 +0000 ---------------------------------------------------------------------- core/src/main/java/brooklyn/location/dynamic/LocationOwner.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0a1e0651/core/src/main/java/brooklyn/location/dynamic/LocationOwner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/dynamic/LocationOwner.java b/core/src/main/java/brooklyn/location/dynamic/LocationOwner.java index c743bbd..f511569 100644 --- a/core/src/main/java/brooklyn/location/dynamic/LocationOwner.java +++ b/core/src/main/java/brooklyn/location/dynamic/LocationOwner.java @@ -27,6 +27,7 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; import brooklyn.location.Location; +import brooklyn.location.LocationDefinition; import brooklyn.util.flags.SetFromFlag; import com.google.common.annotations.Beta; @@ -70,6 +71,9 @@ public interface LocationOwner, E ext AttributeSensor DYNAMIC_LOCATION_STATUS = Sensors.newBooleanSensor( "entity.dynamicLocation.status", "The status of the location owned by this entity"); + AttributeSensor LOCATION_DEFINITION = Sensors.newSensor( + LocationDefinition.class, "entity.dynamicLocation.definition", "The location definition for the location owned by this entity"); + L getDynamicLocation(); L createLocation(Map flags);