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/02/18 12:32:14 UTC
[9/9] incubator-brooklyn git commit: This closes #320
This closes #320
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1d1cfe71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1d1cfe71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1d1cfe71
Branch: refs/heads/master
Commit: 1d1cfe713732292c95ae8fa71771f1bd2c4ff336
Parents: 6c72bd4 7a4e46b
Author: Aled Sage <al...@gmail.com>
Authored: Wed Feb 18 11:31:48 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Feb 18 11:31:48 2015 +0000
----------------------------------------------------------------------
.../java/brooklyn/basic/BrooklynObject.java | 6 +-
api/src/main/java/brooklyn/entity/Entity.java | 26 +-
.../java/brooklyn/entity/basic/EntityLocal.java | 20 +-
.../brooklyn/entity/trait/Configurable.java | 59 +++-
.../main/java/brooklyn/location/Location.java | 27 +-
api/src/main/java/brooklyn/policy/Enricher.java | 13 +-
api/src/main/java/brooklyn/policy/Policy.java | 11 +
.../brooklyn/basic/BasicConfigurableObject.java | 55 +++-
.../brooklyn/basic/BrooklynObjectInternal.java | 67 +++++
.../catalog/internal/CatalogItemDo.java | 14 +
.../internal/CatalogItemDtoAbstract.java | 14 +
.../brooklyn/entity/basic/AbstractEntity.java | 280 ++++++++++++++-----
.../java/brooklyn/entity/basic/Entities.java | 9 +-
.../brooklyn/entity/basic/EntityInternal.java | 23 +-
.../basic/EntityTransientCopyInternal.java | 10 +-
.../group/AbstractMembershipTrackingPolicy.java | 2 +-
.../entity/proxying/InternalPolicyFactory.java | 4 +-
.../rebind/BasicLocationRebindSupport.java | 7 +-
.../entity/rebind/dto/MementosGenerators.java | 2 +-
.../access/PortForwardManagerClient.java | 10 +
.../location/basic/AbstractLocation.java | 175 +++++++++---
.../FixedListMachineProvisioningLocation.java | 3 +-
.../LocalhostMachineProvisioningLocation.java | 2 +-
.../location/basic/LocationInternal.java | 14 +-
.../brooklyn/location/basic/MultiLocation.java | 2 +-
.../location/basic/SimulatedLocation.java | 2 +-
.../location/basic/SshMachineLocation.java | 7 +-
...bstractCloudMachineProvisioningLocation.java | 2 +-
.../internal/LocalLocationManager.java | 3 +-
.../policy/basic/AbstractEntityAdjunct.java | 128 ++++++++-
.../brooklyn/policy/basic/ConfigMapImpl.java | 7 +
.../java/brooklyn/util/task/ssh/SshTasks.java | 2 +-
.../enricher/basic/BasicEnricherTest.java | 4 +-
.../enricher/basic/EnricherConfigTest.java | 8 +-
...DynamicClusterWithAvailabilityZonesTest.java | 3 +-
.../entity/rebind/RebindLocationTest.java | 2 +-
.../entity/rebind/RebindPolicyTest.java | 2 +-
.../basic/ByonLocationResolverTest.java | 22 +-
.../basic/HostLocationResolverTest.java | 2 +-
.../basic/LocalhostLocationResolverTest.java | 16 +-
.../location/basic/LocationConfigTest.java | 32 +--
.../SingleMachineLocationResolverTest.java | 2 +-
.../brooklyn/policy/basic/BasicPolicyTest.java | 4 +-
.../brooklyn/policy/basic/PolicyConfigTest.java | 8 +-
.../brooklyn/util/internal/FlagUtilsTest.java | 45 ++-
...lusterDatabaseExampleAppIntegrationTest.java | 4 +-
.../jclouds/JcloudsByonLocationResolver.java | 2 +-
.../location/jclouds/JcloudsLocation.java | 31 +-
.../jclouds/JcloudsSshMachineLocation.java | 4 +-
.../JcloudsByonLocationResolverAwsLiveTest.java | 4 +-
.../jclouds/JcloudsLocationResolverTest.java | 20 +-
.../location/jclouds/LiveTestEntity.java | 3 +-
.../jclouds/RebindJcloudsLocationLiveTest.java | 4 +-
.../jclouds/RebindJcloudsLocationTest.java | 2 +-
.../policy/autoscaling/AutoScalerPolicy.java | 16 +-
.../AutoScalerPolicyReconfigurationTest.java | 16 +-
.../software/MachineLifecycleEffectorTasks.java | 2 +-
.../entity/software/SshEffectorTasks.java | 2 +-
.../entity/dns/AbstractGeoDnsServiceTest.java | 2 +-
.../camp/brooklyn/LocationsYamlTest.java | 6 +-
.../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 61 +++-
.../main/java/brooklyn/cli/CloudExplorer.java | 2 +-
.../webcluster/SinusoidalLoadGenerator.java | 8 +-
.../rest/resources/PolicyConfigResource.java | 7 +-
.../rest/transform/LocationTransformer.java | 22 +-
.../rest/resources/ApplicationResourceTest.java | 6 +-
.../rest/util/EntityLocationUtilsTest.java | 3 +-
.../main/java/brooklyn/config/ConfigMap.java | 28 +-
68 files changed, 1093 insertions(+), 318 deletions(-)
----------------------------------------------------------------------