brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject [14/14] git commit: Merge and close PR #128
Date Mon, 08 Sep 2014 12:39:14 GMT
Merge and close PR #128


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0d4992b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0d4992b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0d4992b5

Branch: refs/heads/master
Commit: 0d4992b5721bc043591bf9922b00785264122161
Parents: dd7339e a14adf0
Author: Richard Downer <richard@apache.org>
Authored: Mon Sep 8 13:38:28 2014 +0100
Committer: Richard Downer <richard@apache.org>
Committed: Mon Sep 8 13:38:28 2014 +0100

----------------------------------------------------------------------
 .../main/java/brooklyn/basic/BrooklynTypes.java |  13 +-
 .../brooklyn/enricher/basic/Aggregator.java     |   2 +
 .../java/brooklyn/enricher/basic/Combiner.java  |   2 +
 .../enricher/basic/EnricherDynamicType.java     |   4 +
 .../brooklyn/enricher/basic/Propagator.java     |   2 +
 .../brooklyn/enricher/basic/Transformer.java    |   2 +
 .../policy/basic/GeneralPurposePolicy.java      |   4 +
 .../policy/basic/PolicyDynamicType.java         |   4 +
 .../brooklyn/demo/NodeJsTodoApplication.java    |   2 +-
 .../java/brooklyn/enricher/DeltaEnricher.java   |   3 +
 .../brooklyn/enricher/HttpLatencyDetector.java  |   2 +
 .../brooklyn/enricher/RollingMeanEnricher.java  |   3 +
 .../enricher/RollingTimeWindowMeanEnricher.java |   3 +
 .../enricher/TimeFractionDeltaEnricher.java     |   3 +
 .../enricher/TimeWeightedDeltaEnricher.java     |   4 +
 .../policy/autoscaling/AutoScalerPolicy.java    |  13 +-
 .../policy/followthesun/FollowTheSunPolicy.java |   3 +-
 .../policy/ha/ConnectionFailureDetector.java    |   3 +
 .../policy/ha/ServiceFailureDetector.java       |  12 +
 .../brooklyn/policy/ha/ServiceReplacer.java     |   2 +
 .../brooklyn/policy/ha/ServiceRestarter.java    |   3 +
 .../loadbalancing/LoadBalancingPolicy.java      |   5 +-
 .../entity/basic/VanillaSoftwareProcess.java    |   2 +
 .../brooklynnode/BrooklynEntityMirror.java      |   3 +
 .../entity/brooklynnode/BrooklynNode.java       |   2 +
 .../brooklyn/entity/machine/MachineEntity.java  |   2 +
 .../java/brooklyn/entity/pool/ServerPool.java   |   4 +-
 .../brooklyn/entity/messaging/storm/Storm.java  |   4 +
 .../entity/messaging/storm/StormDeployment.java |   4 +
 .../entity/zookeeper/ZooKeeperEnsemble.java     |   3 +
 .../entity/zookeeper/ZooKeeperNode.java         |   3 +
 .../entity/nosql/cassandra/CassandraNode.java   |   4 +
 .../nosql/couchbase/CouchbaseCluster.java       |   3 +
 .../entity/nosql/couchbase/CouchbaseNode.java   |   3 +
 .../elasticsearch/ElasticSearchCluster.java     |   4 +
 .../nosql/elasticsearch/ElasticSearchNode.java  |   4 +
 .../nosql/mongodb/sharding/MongoDBRouter.java   |   4 +
 .../sharding/MongoDBShardedDeployment.java      |   4 +
 .../brooklyn/entity/nosql/riak/RiakCluster.java |  12 +-
 .../brooklyn/entity/nosql/riak/RiakNode.java    |   3 +
 .../webapp/ControlledDynamicWebAppCluster.java  |   2 +
 .../entity/webapp/DynamicWebAppCluster.java     |   2 +
 .../webapp/nodejs/NodeJsWebAppService.java      |   2 +-
 .../main/java/brooklyn/cli/AbstractMain.java    | 231 +++++++++++++++++
 .../main/java/brooklyn/cli/CloudExplorer.java   |  62 +----
 usage/cli/src/main/java/brooklyn/cli/Main.java  | 165 +------------
 .../brooklyn/cli/itemlister/ClassFinder.java    | 148 +++++++++++
 .../cli/itemlister/ItemDescriptors.java         | 158 ++++++++++++
 .../brooklyn/cli/itemlister/ItemLister.java     | 247 +++++++++++++++++++
 .../main/resources/brooklyn-object-list.html    |  66 +++++
 usage/cli/src/main/resources/common.js          |  94 +++++++
 usage/cli/src/main/resources/enricher.html      |  59 +++++
 usage/cli/src/main/resources/entity.html        |  66 +++++
 usage/cli/src/main/resources/items.css          | 150 +++++++++++
 usage/cli/src/main/resources/location.html      |  62 +++++
 usage/cli/src/main/resources/policy.html        |  59 +++++
 .../cli/src/test/java/brooklyn/cli/CliTest.java |   4 +-
 .../brooklyn/cli/CloudExplorerLiveTest.java     |   2 +-
 .../rest/transform/EntityTransformer.java       |   2 +-
 .../brooklyn/util/collections/MutableSet.java   |  14 ++
 60 files changed, 1515 insertions(+), 242 deletions(-)
----------------------------------------------------------------------



Mime
View raw message