You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/05/30 17:15:14 UTC
[3/5] git commit: Merge branch 'master' into jclouds-rebind-fix
Merge branch 'master' into jclouds-rebind-fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/aff80cfb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/aff80cfb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/aff80cfb
Branch: refs/heads/master
Commit: aff80cfb3218276b1b9e2534590fb3e707b6ae21
Parents: 871489a 4977b92
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri May 30 00:04:24 2014 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri May 30 00:04:24 2014 +0100
----------------------------------------------------------------------
.../entity/rebind/RebindExceptionHandler.java | 60 +++++
.../brooklyn/entity/rebind/RebindManager.java | 2 +
.../mementos/BrooklynMementoPersister.java | 5 +-
.../brooklyn/catalog/CatalogPredicates.java | 8 +-
.../java/brooklyn/config/ConfigPredicates.java | 8 +-
.../brooklyn/entity/basic/AbstractEntity.java | 3 +-
.../entity/basic/BrooklynConfigKeys.java | 10 +-
.../entity/basic/BrooklynShutdownHooks.java | 114 +++++++++
.../java/brooklyn/entity/basic/Entities.java | 53 +---
.../brooklyn/entity/basic/EntityFunctions.java | 16 +-
.../brooklyn/entity/basic/EntityPredicates.java | 49 ++--
.../group/AbstractMembershipTrackingPolicy.java | 74 ++++--
.../rebind/RebindExceptionHandlerImpl.java | 254 +++++++++++++++++++
.../entity/rebind/RebindManagerImpl.java | 134 ++++++----
.../AbstractBrooklynMementoPersister.java | 5 +-
.../BrooklynMementoPersisterInMemory.java | 6 +-
.../BrooklynMementoPersisterToFile.java | 3 +-
.../BrooklynMementoPersisterToMultiFile.java | 117 ++++++---
.../location/basic/AbstractLocation.java | 8 +-
.../location/basic/BasicLocationRegistry.java | 42 ++-
.../location/basic/LocationInternal.java | 7 +-
.../location/basic/LocationPredicates.java | 90 +++++++
.../java/brooklyn/location/basic/Locations.java | 38 +++
.../location/basic/MultiLocationResolver.java | 69 +++--
.../location/basic/SshMachineLocation.java | 43 ++--
.../ha/HighAvailabilityManagerImpl.java | 38 ++-
.../NonDeploymentManagementContext.java | 6 +
.../java/brooklyn/util/config/ConfigBag.java | 2 +
.../java/brooklyn/util/file/ArchiveTasks.java | 34 +++
.../java/brooklyn/util/file/ArchiveUtils.java | 48 +++-
.../src/main/java/brooklyn/util/task/Tasks.java | 30 ++-
.../java/brooklyn/util/task/ssh/SshTasks.java | 26 ++
.../entity/basic/BrooklynShutdownHooksTest.java | 82 ++++++
.../group/MembershipTrackingPolicyTest.java | 52 +++-
.../entity/rebind/RebindEnricherTest.java | 116 +++++++++
.../entity/rebind/RebindEntityTest.java | 27 --
.../entity/rebind/RebindFailuresTest.java | 194 ++++++++++++++
.../entity/rebind/RebindPolicyTest.java | 52 +++-
.../entity/rebind/RebindTestFixture.java | 11 +
.../brooklyn/entity/rebind/RebindTestUtils.java | 27 +-
.../rebind/RecordingRebindExceptionHandler.java | 143 +++++++++++
.../location/basic/LocationPredicatesTest.java | 80 ++++++
.../basic/MultiLocationResolverTest.java | 11 +
docs/Gemfile | 6 +
docs/Gemfile.lock | 32 +++
docs/dev/tips/update-docs.md | 15 +-
.../defining-applications/chef-blueprints.md | 215 ++++++++++++++++
.../example_yaml/mysql-chef-1.yaml | 24 ++
.../example_yaml/mysql-chef-2.yaml | 28 ++
docs/use/guide/defining-applications/toc.json | 2 +
.../defining-applications/yaml-reference.md | 3 +-
.../java/brooklyn/demo/RiakClusterExample.java | 32 ++-
.../jclouds/JcloudsByonLocationResolver.java | 1 -
.../location/jclouds/JcloudsLocation.java | 2 +-
.../brooklyn/enricher/RebindEnricherTest.java | 111 ++++++++
.../autoscaling/AutoScalerPolicyRebindTest.java | 106 ++++++++
.../brooklyn/policy/ha/HaPolicyRebindTest.java | 145 +++++++++++
.../policy/ha/ServiceFailureDetectorTest.java | 24 +-
pom.xml | 1 +
sandbox/extra/pom.xml | 60 +++++
.../postgresql/PostgreSqlNodeSaltImpl.java | 159 ++++++++++++
.../brooklyn/entity/salt/SaltBashCommands.java | 89 +++++++
.../java/brooklyn/entity/salt/SaltConfig.java | 97 +++++++
.../java/brooklyn/entity/salt/SaltConfigs.java | 86 +++++++
.../entity/salt/SaltLifecycleEffectorTasks.java | 217 ++++++++++++++++
.../brooklyn/entity/salt/SaltStackMaster.java | 67 +++++
.../entity/salt/SaltStackMasterDriver.java | 22 ++
.../entity/salt/SaltStackMasterImpl.java | 53 ++++
.../entity/salt/SaltStackMasterSshDriver.java | 92 +++++++
.../java/brooklyn/entity/salt/SaltTasks.java | 142 +++++++++++
.../main/resources/brooklyn/entity/salt/master | 64 +++++
.../resources/brooklyn/entity/salt/masterless | 49 ++++
.../main/resources/brooklyn/entity/salt/minion | 49 ++++
.../postgresql/PostgreSqlSaltLiveTest.java | 91 +++++++
.../brooklyn/entity/salt/SaltConfigsTest.java | 66 +++++
.../entity/salt/SaltLiveTestSupport.java | 65 +++++
.../monitoring/zabbix/ZabbixServerImpl.java | 31 ++-
.../brooklyn/entity/chef/ChefBashCommands.java | 50 ----
.../java/brooklyn/entity/chef/ChefConfig.java | 2 +
.../java/brooklyn/entity/chef/ChefEntity.java | 2 +-
.../brooklyn/entity/chef/ChefEntityImpl.java | 6 +
.../entity/chef/ChefLifecycleEffectorTasks.java | 11 +-
.../brooklyn/entity/chef/ChefSoloTasks.java | 48 +---
.../java/brooklyn/entity/chef/ChefTasks.java | 64 ++++-
.../database/postgresql/PostgreSqlSpecs.java | 11 +-
.../entity/zookeeper/ZooKeeperEnsembleImpl.java | 55 ++--
.../entity/network/bind/BindDnsServerImpl.java | 40 +--
.../cassandra/CassandraDatacenterImpl.java | 55 ++--
.../nosql/cassandra/CassandraFabricImpl.java | 45 ++--
.../nosql/couchbase/CouchbaseClusterImpl.java | 37 ++-
.../nosql/mongodb/MongoDBReplicaSetImpl.java | 64 ++---
.../sharding/MongoDBRouterClusterImpl.java | 30 ++-
.../sharding/MongoDBShardedDeploymentImpl.java | 30 ++-
.../brooklyn/entity/nosql/riak/RiakCluster.java | 9 +
.../entity/nosql/riak/RiakClusterImpl.java | 109 +++++---
.../brooklyn/entity/nosql/riak/RiakNode.java | 49 ++--
.../entity/nosql/riak/RiakNodeDriver.java | 2 +
.../entity/nosql/riak/RiakNodeImpl.java | 60 +++--
.../entity/nosql/riak/RiakNodeSshDriver.java | 64 +++--
.../nosql/riak/RiakClusterEc2LiveTest.java | 7 +-
.../riak/RiakNodeGoogleComputeLiveTest.java | 7 +-
.../entity/dns/AbstractGeoDnsServiceImpl.java | 22 +-
.../entity/proxy/AbstractControllerImpl.java | 203 +++++++--------
.../AbstractNonProvisionedControllerImpl.java | 57 +++--
.../brooklyn/entity/proxy/LoadBalancer.java | 10 +-
.../entity/proxy/LoadBalancerClusterImpl.java | 14 +-
.../entity/proxy/nginx/NginxControllerImpl.java | 35 ++-
.../entity/dns/AbstractGeoDnsServiceTest.java | 7 +-
.../proxy/TrackingAbstractControllerImpl.java | 10 +-
.../proxy/nginx/NginxLightIntegrationTest.java | 24 +-
.../camp/brooklyn/YamlLauncherAbstract.java | 3 +-
.../spi/dsl/BrooklynDslDeferredSupplier.java | 6 +-
.../spi/dsl/methods/BrooklynDslCommon.java | 8 +-
.../brooklyn/spi/dsl/methods/DslComponent.java | 42 ++-
.../camp/brooklyn/AbstractYamlTest.java | 10 +-
.../camp/brooklyn/DslAndRebindYamlTest.java | 168 ++++++++++++
.../camp/brooklyn/EntitiesYamlTest.java | 2 +-
...aWebAppWithDslYamlRebindIntegrationTest.java | 105 ++++++++
usage/camp/src/test/resources/mysql-chef.yaml | 28 ++
...-java-web-app-spec-and-db-with-function.yaml | 21 ++
usage/jsgui/build/gzip-with-redirect.sh | 23 --
usage/jsgui/pom.xml | 32 +--
.../main/webapp/assets/js/view/googlemaps.js | 6 +-
.../brooklyn/launcher/BrooklynLauncher.java | 7 +-
.../camp/BrooklynCampPlatformLauncher.java | 7 +-
.../rest/resources/LocationResource.java | 13 +-
.../brooklyn/util/collections/MutableList.java | 14 +-
.../util/guava/SerializablePredicate.java | 8 +
.../src/main/java/brooklyn/util/net/Urls.java | 15 ++
.../brooklyn/util/text/StringPredicates.java | 7 +-
.../main/java/brooklyn/util/text/Strings.java | 21 +-
.../test/java/brooklyn/util/net/UrlsTest.java | 10 +
132 files changed, 5229 insertions(+), 1009 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/aff80cfb/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------