This closes #340
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1db462a3 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1db462a3 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1db462a3 Branch: refs/heads/master Commit: 1db462a3f9dba93343668ec7528c088061dcbaf7 Parents: f4281af e3dd409 Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Thu Sep 22 22:08:47 2016 +0100 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Thu Sep 22 22:08:47 2016 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/api/entity/Entity.java | 18 - .../apache/brooklyn/api/entity/EntityLocal.java | 10 - .../apache/brooklyn/api/objs/Configurable.java | 10 +- .../camp/brooklyn/BrooklynCampConstants.java | 6 +- .../BrooklynComponentTemplateResolver.java | 104 ++--- .../brooklyn/ConfigInheritanceYamlTest.java | 127 +++--- .../ExternalConfigBrooklynPropertiesTest.java | 2 +- .../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 9 + .../catalog/internal/CatalogInitialization.java | 2 +- .../core/config/BasicConfigInheritance.java | 181 ++++++++ .../brooklyn/core/config/BasicConfigKey.java | 72 ++- .../apache/brooklyn/core/config/ConfigKeys.java | 3 + .../brooklyn/core/config/MapConfigKey.java | 4 +- .../config/internal/AbstractConfigMapImpl.java | 455 ++++++++++++++++++- .../AncestorContainerAndKeyValueIterator.java | 67 +++ .../internal/LazyContainerAndKeyValue.java | 93 ++++ .../core/effector/ssh/SshEffectorTasks.java | 67 +-- .../brooklyn/core/entity/AbstractEntity.java | 207 ++------- .../core/entity/BrooklynConfigKeys.java | 22 +- .../brooklyn/core/entity/EntityAsserts.java | 2 +- .../brooklyn/core/entity/EntityFunctions.java | 44 +- .../brooklyn/core/entity/EntityInternal.java | 41 -- .../internal/ConfigMapViewWithStringKeys.java | 10 +- .../core/entity/internal/EntityConfigMap.java | 384 +++------------- .../internal/EntityTransientCopyInternal.java | 16 - .../entity/lifecycle/ServiceStateLogic.java | 5 +- .../core/internal/BrooklynProperties.java | 19 +- .../core/internal/BrooklynPropertiesImpl.java | 36 +- .../core/location/AbstractLocation.java | 144 ++---- .../core/location/BasicLocationRegistry.java | 4 +- .../location/internal/LocationConfigMap.java | 107 +++++ .../core/mgmt/EntityManagementUtils.java | 4 +- .../entitlement/PerUserEntitlementManager.java | 11 +- .../BasicExternalConfigSupplierRegistry.java | 2 +- .../internal/DeferredBrooklynProperties.java | 23 +- .../mgmt/internal/LocalLocationManager.java | 6 +- .../mgmt/rebind/BasicEntityRebindSupport.java | 4 +- .../mgmt/rebind/BasicLocationRebindSupport.java | 10 +- .../mgmt/rebind/dto/MementosGenerators.java | 56 ++- .../AbstractConfigurationSupportInternal.java | 101 ++++ .../core/objs/AbstractEntityAdjunct.java | 84 +--- .../brooklyn/core/objs/AdjunctConfigMap.java | 122 ++--- .../core/objs/BasicConfigurableObject.java | 13 +- .../brooklyn/core/objs/BasicSpecParameter.java | 5 +- .../core/objs/BrooklynObjectInternal.java | 43 +- .../core/sensor/DependentConfiguration.java | 10 +- .../core/server/BrooklynServerPaths.java | 4 +- .../FixedListMachineProvisioningLocation.java | 11 +- .../brooklyn/util/core/ClassLoaderUtils.java | 2 +- .../brooklyn/util/core/task/ssh/SshTasks.java | 30 +- .../brooklyn/core/config/ConfigKeysTest.java | 8 +- .../config/MapConfigKeyAndFriendsMoreTest.java | 56 ++- .../entity/ConfigEntityInheritanceTest.java | 126 ++++- .../brooklyn/core/entity/EntityConfigTest.java | 97 ++-- .../core/location/LocationConfigTest.java | 15 +- .../core/mgmt/rebind/RebindEntityTest.java | 23 +- .../core/mgmt/rebind/RebindFailuresTest.java | 30 +- .../RebindManagerExceptionHandlerTest.java | 9 +- .../core/test/BrooklynAppUnitTestSupport.java | 8 +- .../util/core/internal/FlagUtilsTest.java | 7 + .../jclouds/JcloudsByonLocationResolver.java | 3 +- .../location/jclouds/JcloudsLocation.java | 28 +- .../jclouds/JcloudsSshMachineLocation.java | 4 +- .../AbstractPortableTemplateBuilder.java | 2 +- .../jclouds/JcloudsLocationResolverTest.java | 34 +- .../loadbalancing/LoadBalancingPolicy.java | 14 +- .../apache/brooklyn/rest/BrooklynWebConfig.java | 4 +- .../rest/resources/EntityConfigResource.java | 7 +- .../rest/resources/PolicyConfigResource.java | 4 +- .../rest/transform/LocationTransformer.java | 17 +- .../rest/resources/LocationResourceTest.java | 23 +- .../rest/util/EntityLocationUtilsTest.java | 2 +- .../BrooklynNodeUpgradeEffectorBody.java | 2 +- .../entity/chef/ChefLifecycleEffectorTasks.java | 4 +- .../apache/brooklyn/entity/java/JmxSupport.java | 2 +- .../base/AbstractSoftwareProcessSshDriver.java | 2 +- .../entity/software/base/SoftwareProcess.java | 39 +- .../base/VanillaSoftwareProcessSshDriver.java | 3 +- .../SoftwareProcessEntityFeedRebindTest.java | 2 +- .../base/SoftwareProcessEntityTest.java | 30 +- .../base/VanillaSoftwareProcessTest.java | 18 +- .../software/base/test/jmx/JmxService.java | 22 +- .../brooklyn/test/framework/TestCase.java | 5 +- .../brooklyn/config/ConfigInheritance.java | 211 +++++++-- .../brooklyn/config/ConfigInheritances.java | 200 ++++++++ .../org/apache/brooklyn/config/ConfigKey.java | 28 +- .../org/apache/brooklyn/config/ConfigMap.java | 111 +++-- .../brooklyn/config/ConfigValueAtContainer.java | 51 +++ .../apache/brooklyn/config/StringConfigMap.java | 10 + .../brooklyn/util/collections/MutableMap.java | 4 +- .../util/exceptions/ReferenceWithError.java | 16 +- 91 files changed, 2670 insertions(+), 1423 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1db462a3/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java ----------------------------------------------------------------------
