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 4017B17648 for ; Tue, 1 Sep 2015 15:16:34 +0000 (UTC) Received: (qmail 42818 invoked by uid 500); 1 Sep 2015 15:16:34 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 42787 invoked by uid 500); 1 Sep 2015 15:16:34 -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 42774 invoked by uid 99); 1 Sep 2015 15:16:34 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Sep 2015 15:16:34 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id A7D81F0725 for ; Tue, 1 Sep 2015 15:16:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id MfbnfO3syHOK for ; Tue, 1 Sep 2015 15:16:26 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id AC4E934403 for ; Tue, 1 Sep 2015 15:16:25 +0000 (UTC) Received: (qmail 42329 invoked by uid 99); 1 Sep 2015 15:16:24 -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; Tue, 01 Sep 2015 15:16:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 600D2DFF8C; Tue, 1 Sep 2015 15:16:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.incubator.apache.org Date: Tue, 01 Sep 2015 15:16:25 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [02/28] incubator-brooklyn git commit: Add external-config-supplier registry to management context. Add external-config-supplier registry to management context. Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3ed391a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3ed391a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3ed391a2 Branch: refs/heads/master Commit: 3ed391a25fdf52adbc51cf7b11029966995aeeba Parents: b0b4cd8 Author: Alasdair Hodge Authored: Mon Jun 22 16:52:28 2015 +0100 Committer: Alasdair Hodge Committed: Tue Aug 25 11:49:23 2015 +0100 ---------------------------------------------------------------------- .../core/mgmt/internal/AbstractManagementContext.java | 13 +++++++++++-- .../core/mgmt/internal/ManagementContextInternal.java | 3 +++ .../mgmt/internal/NonDeploymentManagementContext.java | 6 ++++++ 3 files changed, 20 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3ed391a2/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java index cdd7219..76871cd 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java @@ -164,9 +164,11 @@ public abstract class AbstractManagementContext implements ManagementContextInte private final BrooklynStorage storage; + protected final ExternalConfigSupplierRegistry configSupplierRegistry; + private volatile boolean running = true; protected boolean startupComplete = false; - protected final List errors = Collections.synchronizedList(MutableList.of()); + protected final List errors = Collections.synchronizedList(MutableList.of()); protected Maybe uri = Maybe.absent(); protected CatalogInitialization catalogInitialization; @@ -191,6 +193,7 @@ public abstract class AbstractManagementContext implements ManagementContextInte this.highAvailabilityManager = new HighAvailabilityManagerImpl(this); // TODO leaking "this" reference; yuck this.entitlementManager = Entitlements.newManager(this, brooklynProperties); + this.configSupplierRegistry = new BasicExternalConfigSupplierRegistry(this); // TODO leaking "this" reference; yuck } @Override @@ -478,5 +481,11 @@ public abstract class AbstractManagementContext implements ManagementContextInte public List errors() { return errors; } - + + /** @since 0.8.0 */ + @Override + public ExternalConfigSupplierRegistry getExternalConfigProviderRegistry() { + return configSupplierRegistry; + } + } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3ed391a2/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/ManagementContextInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/ManagementContextInternal.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/ManagementContextInternal.java index 933f0ac..e76f2fb 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/ManagementContextInternal.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/ManagementContextInternal.java @@ -119,4 +119,7 @@ public interface ManagementContextInternal extends ManagementContext { @Beta void setCatalogInitialization(CatalogInitialization catalogInitialization); + @Beta + ExternalConfigSupplierRegistry getExternalConfigProviderRegistry(); + } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3ed391a2/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java index 7e1c324..87e8f84 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java @@ -465,6 +465,12 @@ public class NonDeploymentManagementContext implements ManagementContextInternal initialManagementContext.setCatalogInitialization(catalogInitialization); } + @Override + public ExternalConfigSupplierRegistry getExternalConfigProviderRegistry() { + checkInitialManagementContextReal(); + return initialManagementContext.getExternalConfigProviderRegistry(); + } + /** * For when the initial management context is not "real"; the changeListener is a no-op, but everything else forbidden. *