You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2017/02/15 18:31:21 UTC
[28/28] brooklyn-server git commit: This closes #462
This closes #462
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/39301e0f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/39301e0f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/39301e0f
Branch: refs/heads/master
Commit: 39301e0f7bc10f773e95c9ebcae5809c68e964d9
Parents: 3c5981b 0a55a82
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Feb 15 18:30:30 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Feb 15 18:30:30 2017 +0000
----------------------------------------------------------------------
.../internal/AbstractBrooklynObjectSpec.java | 35 +-
.../apache/brooklyn/api/objs/Configurable.java | 11 +-
.../BrooklynComponentTemplateResolver.java | 63 ++--
.../BrooklynEntityDecorationResolver.java | 6 +-
.../spi/creation/CampInternalUtils.java | 38 +--
.../brooklyn/spi/dsl/methods/DslComponent.java | 1 +
.../brooklyn/ConfigInheritanceYamlTest.java | 242 ++++++++++---
.../camp/brooklyn/ConfigParametersYamlTest.java | 182 +++++++++-
.../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 15 +-
.../brooklyn/catalog/CatalogYamlEntityTest.java | 3 +-
.../catalog/SpecParameterUnwrappingTest.java | 125 ++++---
.../catalog/internal/BasicBrooklynCatalog.java | 3 +-
.../core/config/BasicConfigInheritance.java | 340 +++++++++++++++++--
.../config/internal/AbstractConfigMapImpl.java | 177 ++++++----
.../core/effector/ssh/SshEffectorTasks.java | 6 +-
.../brooklyn/core/entity/EntityDynamicType.java | 14 +-
.../core/entity/EntityTypeSnapshot.java | 2 +-
.../core/entity/internal/EntityConfigMap.java | 1 +
.../core/internal/BrooklynPropertiesImpl.java | 81 +++--
.../core/mgmt/EntityManagementUtils.java | 8 +-
.../entitlement/PerUserEntitlementManager.java | 2 +-
.../internal/DeferredBrooklynProperties.java | 46 +--
.../AbstractConfigurationSupportInternal.java | 42 ++-
.../core/objs/BasicConfigurableObject.java | 19 +-
.../brooklyn/core/objs/BasicSpecParameter.java | 193 +++++++++--
.../brooklyn/core/objs/BrooklynDynamicType.java | 44 ++-
.../core/objs/BrooklynObjectInternal.java | 4 +-
.../core/objs/BrooklynTypeSnapshot.java | 5 +-
.../core/objs/proxy/InternalEntityFactory.java | 7 +-
.../brooklyn/util/core/task/ssh/SshTasks.java | 4 +-
.../util/core/xstream/ClassRenamingMapper.java | 4 +-
.../brooklyn/core/entity/EntityConfigTest.java | 30 +-
.../mgmt/persist/XmlMementoSerializerTest.java | 12 +
.../rebind/RebindConfigInheritanceTest.java | 145 ++++++++
.../core/mgmt/rebind/RebindOptions.java | 1 +
...RebindWithDeserializingClassRenamesTest.java | 35 +-
.../objs/BasicSpecParameterFromListTest.java | 32 +-
.../util/core/internal/FlagUtilsTest.java | 15 +-
.../config-inheritance-basic-2016-10-wj5s8u9h73 | 50 +++
.../config-inheritance-basic-2016-11-kmpez5fznt | 46 +++
...nfig-inheritance-prebasic-2016-07-toruf2wxg4 | 137 ++++++++
.../apache/brooklyn/rest/BrooklynWebConfig.java | 2 +-
.../brooklyn/config/ConfigInheritance.java | 50 ++-
.../brooklyn/config/ConfigInheritances.java | 30 +-
.../org/apache/brooklyn/config/ConfigMap.java | 19 +-
.../org/apache/brooklyn/util/guava/Maybe.java | 19 +-
46 files changed, 1870 insertions(+), 476 deletions(-)
----------------------------------------------------------------------