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 2015/12/17 13:54:26 UTC
[5/5] incubator-brooklyn git commit: This closes #1112
This closes #1112
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a5f359f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a5f359f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a5f359f0
Branch: refs/heads/master
Commit: a5f359f04e7b90170b37c7ef8f032ceb51224ec7
Parents: 3584f5b f66a72d
Author: Aled Sage <al...@gmail.com>
Authored: Thu Dec 17 12:54:11 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Dec 17 12:54:11 2015 +0000
----------------------------------------------------------------------
.../brooklyn/camp/spi/resolve/PdpProcessor.java | 2 +-
.../interpret/PlanInterpretationContext.java | 2 +-
.../core/internal/BrooklynProperties.java | 260 ++--------
.../core/internal/BrooklynPropertiesImpl.java | 477 +++++++++++++++++++
.../core/location/BasicLocationRegistry.java | 7 +-
.../internal/AbstractManagementContext.java | 4 +-
.../core/mgmt/internal/CampYamlParser.java | 34 ++
.../internal/DeferredBrooklynProperties.java | 370 ++++++++++++++
.../mgmt/internal/LocalManagementContext.java | 2 +-
.../location/byon/ByonLocationResolverTest.java | 4 +-
docs/guide/ops/brooklyn_properties.md | 23 +
docs/guide/ops/externalized-configuration.md | 11 +
.../brooklynnode/LocalBrooklynNodeImpl.java | 4 +-
.../camp/brooklyn/BrooklynCampPlatform.java | 32 +-
.../ExternalConfigBrooklynPropertiesTest.java | 146 ++++++
.../camp/brooklyn/ExternalConfigYamlTest.java | 16 +
.../provider/DelegatingSecurityProvider.java | 3 +-
.../provider/ExplicitUsersSecurityProvider.java | 3 +-
.../util/json/BrooklynJacksonJsonProvider.java | 3 +-
19 files changed, 1170 insertions(+), 233 deletions(-)
----------------------------------------------------------------------