This closes #137
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/be939616 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/be939616 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/be939616 Branch: refs/heads/master Commit: be93961605489a70b183d2f0c4a26ab0dd7afac1 Parents: 68592b4 d23d5c0 Author: Alex Heneveld <[email protected]> Authored: Mon Sep 1 17:14:03 2014 +0100 Committer: Alex Heneveld <[email protected]> Committed: Mon Sep 1 17:14:03 2014 +0100 ---------------------------------------------------------------------- .../java/brooklyn/entity/basic/Entities.java | 28 ++ .../entity/group/DynamicClusterImpl.java | 125 ++++---- .../JavaBrooklynClassLoadingContext.java | 2 +- .../java/brooklyn/util/flags/TypeCoercions.java | 11 +- .../main/java/brooklyn/util/http/HttpTool.java | 9 +- .../src/main/java/brooklyn/util/task/Tasks.java | 124 ++------ .../java/brooklyn/util/task/ValueResolver.java | 284 +++++++++++++++++++ .../test/java/brooklyn/util/task/TasksTest.java | 1 + .../brooklyn/util/task/ValueResolverTest.java | 75 +++++ .../brooklynnode/BrooklynEntityMirrorImpl.java | 3 +- .../nosql/couchbase/CouchbaseCluster.java | 32 ++- .../nosql/couchbase/CouchbaseClusterImpl.java | 194 +++++++++++-- .../nosql/couchbase/CouchbaseLoadGenerator.java | 59 ---- .../couchbase/CouchbaseLoadGeneratorDriver.java | 28 -- .../couchbase/CouchbaseLoadGeneratorImpl.java | 50 ---- .../CouchbaseLoadGeneratorSshDriver.java | 122 -------- .../entity/nosql/couchbase/CouchbaseNode.java | 6 + .../nosql/couchbase/CouchbaseNodeDriver.java | 2 + .../nosql/couchbase/CouchbaseNodeImpl.java | 53 ++++ .../nosql/couchbase/CouchbaseNodeSshDriver.java | 138 ++++++++- .../nosql/couchbase/CouchbaseSyncGateway.java | 75 +++++ .../couchbase/CouchbaseSyncGatewayDriver.java | 27 ++ .../couchbase/CouchbaseSyncGatewayImpl.java | 82 ++++++ .../CouchbaseSyncGatewaySshDriver.java | 176 ++++++++++++ .../entity/nosql/couchbase/pillowfight.yaml | 77 +++++ .../CouchbaseSyncGatewayEc2LiveTest.java | 137 +++++++++ .../BrooklynComponentTemplateResolver.java | 6 +- .../spi/dsl/methods/BrooklynDslCommon.java | 106 ++++--- .../brooklyn/spi/dsl/methods/DslComponent.java | 165 ++++++++--- .../camp/brooklyn/EntitiesYamlTest.java | 65 ++++- .../brooklyn/ReferencingYamlTestEntity.java | 8 + .../resources/test-referencing-entities.yaml | 23 +- .../src/test/resources/couchbase-w-loadgen.yaml | 54 ++++ .../test/resources/couchbase-w-pillowfight.yaml | 35 +++ .../launcher/src/test/resources/couchbase.yaml | 14 +- .../BrooklynPropertiesSecurityFilter.java | 9 +- .../rest/transform/EffectorTransformer.java | 28 +- .../util/collections/CollectionFunctionals.java | 23 ++ .../java/brooklyn/util/guava/Functionals.java | 12 + .../guava/IllegalStateExceptionSupplier.java | 41 +++ .../main/java/brooklyn/util/guava/Maybe.java | 40 ++- .../main/java/brooklyn/util/time/Durations.java | 26 ++ 42 files changed, 1981 insertions(+), 594 deletions(-) ----------------------------------------------------------------------
