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/08/06 18:32:39 UTC

[25/26] incubator-brooklyn git commit: [BROOKLYN-162] Renaming of the NoSQL packages

[BROOKLYN-162] Renaming of the NoSQL packages 

- From brooklyn.entity.nosql to org.apache.brooklyn.entity.nosql


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

Branch: refs/heads/master
Commit: d5cf5285286a6397d8f7abef32c00e2179259b38
Parents: 08662a7
Author: Yavor Yanchev <ya...@yanchev.com>
Authored: Thu Aug 6 17:05:21 2015 +0300
Committer: Yavor Yanchev <ya...@yanchev.com>
Committed: Thu Aug 6 18:25:29 2015 +0300

----------------------------------------------------------------------
 .../nosql-cassandra/cassandra.include.md        |   4 +-
 docs/guide/ops/catalog/index.md                 |   4 +-
 .../brooklyn/demo/CumulusRDFApplication.java    |  11 +-
 .../demo/HighAvailabilityCassandraCluster.java  |   5 +-
 .../brooklyn/demo/ResilientMongoDbApp.java      |   5 +-
 .../brooklyn/demo/RiakClusterExample.java       |   5 +-
 .../brooklyn/demo/SimpleCassandraCluster.java   |   3 +-
 .../brooklyn/demo/SimpleCouchDBCluster.java     |   3 +-
 .../brooklyn/demo/SimpleMongoDBReplicaSet.java  |   5 +-
 .../brooklyn/demo/SimpleRedisCluster.java       |   3 +-
 .../brooklyn/demo/WideAreaCassandraCluster.java |  11 +-
 .../brooklyn/demo/ha-cassandra-cluster.yaml     |   4 +-
 .../brooklyn/demo/simple-cassandra-cluster.yaml |   2 +-
 .../demo/wide-area-cassandra-cluster.yaml       |   8 +-
 .../brooklyn/demo/NodeJsTodoApplication.java    |   3 +-
 .../apache/brooklyn/demo/nodejs-riak-todo.yaml  |   2 +-
 .../org/apache/brooklyn/demo/nodejs-todo.yaml   |   2 +-
 software/nosql/pom.xml                          |  28 +-
 .../nosql/cassandra/CassandraCluster.java       |  30 -
 .../nosql/cassandra/CassandraClusterImpl.java   |  27 -
 .../nosql/cassandra/CassandraDatacenter.java    | 214 ------
 .../cassandra/CassandraDatacenterImpl.java      | 625 -----------------
 .../entity/nosql/cassandra/CassandraFabric.java |  80 ---
 .../nosql/cassandra/CassandraFabricImpl.java    | 395 -----------
 .../entity/nosql/cassandra/CassandraNode.java   | 231 -------
 .../nosql/cassandra/CassandraNodeDriver.java    |  47 --
 .../nosql/cassandra/CassandraNodeImpl.java      | 594 ----------------
 .../nosql/cassandra/CassandraNodeSshDriver.java | 420 -----------
 .../entity/nosql/cassandra/TokenGenerator.java  |  49 --
 .../entity/nosql/cassandra/TokenGenerators.java | 192 ------
 .../nosql/couchbase/CouchbaseCluster.java       | 134 ----
 .../nosql/couchbase/CouchbaseClusterImpl.java   | 597 ----------------
 .../entity/nosql/couchbase/CouchbaseNode.java   | 159 -----
 .../nosql/couchbase/CouchbaseNodeDriver.java    |  41 --
 .../nosql/couchbase/CouchbaseNodeImpl.java      | 269 --------
 .../nosql/couchbase/CouchbaseNodeSshDriver.java | 512 --------------
 .../nosql/couchbase/CouchbaseSyncGateway.java   |  75 --
 .../couchbase/CouchbaseSyncGatewayDriver.java   |  27 -
 .../couchbase/CouchbaseSyncGatewayImpl.java     |  82 ---
 .../CouchbaseSyncGatewaySshDriver.java          | 167 -----
 .../entity/nosql/couchdb/CouchDBCluster.java    |  48 --
 .../nosql/couchdb/CouchDBClusterImpl.java       |  51 --
 .../entity/nosql/couchdb/CouchDBNode.java       |  66 --
 .../entity/nosql/couchdb/CouchDBNodeDriver.java |  37 -
 .../entity/nosql/couchdb/CouchDBNodeImpl.java   | 106 ---
 .../nosql/couchdb/CouchDBNodeSshDriver.java     | 153 -----
 .../elasticsearch/ElasticSearchCluster.java     |  40 --
 .../elasticsearch/ElasticSearchClusterImpl.java |  45 --
 .../nosql/elasticsearch/ElasticSearchNode.java  |  88 ---
 .../elasticsearch/ElasticSearchNodeDriver.java  |  25 -
 .../elasticsearch/ElasticSearchNodeImpl.java    | 110 ---
 .../ElasticSearchNodeSshDriver.java             | 139 ----
 .../nosql/mongodb/AbstractMongoDBServer.java    |  61 --
 .../nosql/mongodb/AbstractMongoDBSshDriver.java | 175 -----
 .../entity/nosql/mongodb/MongoDBClient.java     |  65 --
 .../nosql/mongodb/MongoDBClientDriver.java      |  25 -
 .../entity/nosql/mongodb/MongoDBClientImpl.java |  43 --
 .../nosql/mongodb/MongoDBClientSshDriver.java   | 147 ----
 .../nosql/mongodb/MongoDBClientSupport.java     | 263 -------
 .../entity/nosql/mongodb/MongoDBDriver.java     |  24 -
 .../entity/nosql/mongodb/MongoDBReplicaSet.java |  84 ---
 .../nosql/mongodb/MongoDBReplicaSetImpl.java    | 404 -----------
 .../entity/nosql/mongodb/MongoDBServer.java     | 152 ----
 .../entity/nosql/mongodb/MongoDBServerImpl.java | 214 ------
 .../entity/nosql/mongodb/MongoDBSshDriver.java  |  57 --
 .../entity/nosql/mongodb/ReplicaSetConfig.java  | 278 --------
 .../nosql/mongodb/ReplicaSetMemberStatus.java   |  66 --
 .../sharding/CoLocatedMongoDBRouter.java        |  59 --
 .../sharding/CoLocatedMongoDBRouterImpl.java    |  70 --
 .../mongodb/sharding/MongoDBConfigServer.java   |  27 -
 .../sharding/MongoDBConfigServerCluster.java    |  35 -
 .../MongoDBConfigServerClusterImpl.java         |  57 --
 .../sharding/MongoDBConfigServerDriver.java     |  25 -
 .../sharding/MongoDBConfigServerImpl.java       |  36 -
 .../sharding/MongoDBConfigServerSshDriver.java  |  43 --
 .../nosql/mongodb/sharding/MongoDBRouter.java   |  51 --
 .../mongodb/sharding/MongoDBRouterCluster.java  |  54 --
 .../sharding/MongoDBRouterClusterImpl.java      | 101 ---
 .../mongodb/sharding/MongoDBRouterDriver.java   |  25 -
 .../mongodb/sharding/MongoDBRouterImpl.java     |  85 ---
 .../sharding/MongoDBRouterSshDriver.java        |  52 --
 .../mongodb/sharding/MongoDBShardCluster.java   |  27 -
 .../sharding/MongoDBShardClusterImpl.java       | 179 -----
 .../sharding/MongoDBShardedDeployment.java      | 102 ---
 .../sharding/MongoDBShardedDeploymentImpl.java  | 147 ----
 .../entity/nosql/redis/RedisCluster.java        |  41 --
 .../entity/nosql/redis/RedisClusterImpl.java    | 130 ----
 .../brooklyn/entity/nosql/redis/RedisShard.java |  26 -
 .../entity/nosql/redis/RedisShardImpl.java      |  26 -
 .../brooklyn/entity/nosql/redis/RedisSlave.java |  42 --
 .../entity/nosql/redis/RedisSlaveImpl.java      |  34 -
 .../brooklyn/entity/nosql/redis/RedisStore.java |  69 --
 .../entity/nosql/redis/RedisStoreDriver.java    |  27 -
 .../entity/nosql/redis/RedisStoreImpl.java      | 154 -----
 .../entity/nosql/redis/RedisStoreSshDriver.java | 131 ----
 .../brooklyn/entity/nosql/riak/RiakCluster.java |  65 --
 .../entity/nosql/riak/RiakClusterImpl.java      | 264 -------
 .../brooklyn/entity/nosql/riak/RiakNode.java    | 238 -------
 .../entity/nosql/riak/RiakNodeDriver.java       |  48 --
 .../entity/nosql/riak/RiakNodeImpl.java         | 306 ---------
 .../entity/nosql/riak/RiakNodeSshDriver.java    | 614 -----------------
 .../brooklyn/entity/nosql/solr/SolrServer.java  |  81 ---
 .../entity/nosql/solr/SolrServerDriver.java     |  30 -
 .../entity/nosql/solr/SolrServerImpl.java       |  75 --
 .../entity/nosql/solr/SolrServerSshDriver.java  | 158 -----
 .../nosql/cassandra/CassandraCluster.java       |  30 +
 .../nosql/cassandra/CassandraClusterImpl.java   |  27 +
 .../nosql/cassandra/CassandraDatacenter.java    | 215 ++++++
 .../cassandra/CassandraDatacenterImpl.java      | 625 +++++++++++++++++
 .../entity/nosql/cassandra/CassandraFabric.java |  80 +++
 .../nosql/cassandra/CassandraFabricImpl.java    | 395 +++++++++++
 .../entity/nosql/cassandra/CassandraNode.java   | 231 +++++++
 .../nosql/cassandra/CassandraNodeDriver.java    |  47 ++
 .../nosql/cassandra/CassandraNodeImpl.java      | 594 ++++++++++++++++
 .../nosql/cassandra/CassandraNodeSshDriver.java | 420 +++++++++++
 .../entity/nosql/cassandra/TokenGenerator.java  |  49 ++
 .../entity/nosql/cassandra/TokenGenerators.java | 192 ++++++
 .../nosql/couchbase/CouchbaseCluster.java       | 134 ++++
 .../nosql/couchbase/CouchbaseClusterImpl.java   | 597 ++++++++++++++++
 .../entity/nosql/couchbase/CouchbaseNode.java   | 159 +++++
 .../nosql/couchbase/CouchbaseNodeDriver.java    |  41 ++
 .../nosql/couchbase/CouchbaseNodeImpl.java      | 269 ++++++++
 .../nosql/couchbase/CouchbaseNodeSshDriver.java | 512 ++++++++++++++
 .../nosql/couchbase/CouchbaseSyncGateway.java   |  75 ++
 .../couchbase/CouchbaseSyncGatewayDriver.java   |  27 +
 .../couchbase/CouchbaseSyncGatewayImpl.java     |  82 +++
 .../CouchbaseSyncGatewaySshDriver.java          | 167 +++++
 .../entity/nosql/couchdb/CouchDBCluster.java    |  48 ++
 .../nosql/couchdb/CouchDBClusterImpl.java       |  51 ++
 .../entity/nosql/couchdb/CouchDBNode.java       |  66 ++
 .../entity/nosql/couchdb/CouchDBNodeDriver.java |  37 +
 .../entity/nosql/couchdb/CouchDBNodeImpl.java   | 106 +++
 .../nosql/couchdb/CouchDBNodeSshDriver.java     | 153 +++++
 .../elasticsearch/ElasticSearchCluster.java     |  40 ++
 .../elasticsearch/ElasticSearchClusterImpl.java |  45 ++
 .../nosql/elasticsearch/ElasticSearchNode.java  |  88 +++
 .../elasticsearch/ElasticSearchNodeDriver.java  |  25 +
 .../elasticsearch/ElasticSearchNodeImpl.java    | 110 +++
 .../ElasticSearchNodeSshDriver.java             | 139 ++++
 .../nosql/mongodb/AbstractMongoDBServer.java    |  61 ++
 .../nosql/mongodb/AbstractMongoDBSshDriver.java | 175 +++++
 .../entity/nosql/mongodb/MongoDBClient.java     |  65 ++
 .../nosql/mongodb/MongoDBClientDriver.java      |  25 +
 .../entity/nosql/mongodb/MongoDBClientImpl.java |  43 ++
 .../nosql/mongodb/MongoDBClientSshDriver.java   | 147 ++++
 .../nosql/mongodb/MongoDBClientSupport.java     | 263 +++++++
 .../entity/nosql/mongodb/MongoDBDriver.java     |  24 +
 .../entity/nosql/mongodb/MongoDBReplicaSet.java |  84 +++
 .../nosql/mongodb/MongoDBReplicaSetImpl.java    | 404 +++++++++++
 .../entity/nosql/mongodb/MongoDBServer.java     | 152 ++++
 .../entity/nosql/mongodb/MongoDBServerImpl.java | 214 ++++++
 .../entity/nosql/mongodb/MongoDBSshDriver.java  |  57 ++
 .../entity/nosql/mongodb/ReplicaSetConfig.java  | 278 ++++++++
 .../nosql/mongodb/ReplicaSetMemberStatus.java   |  66 ++
 .../sharding/CoLocatedMongoDBRouter.java        |  59 ++
 .../sharding/CoLocatedMongoDBRouterImpl.java    |  70 ++
 .../mongodb/sharding/MongoDBConfigServer.java   |  28 +
 .../sharding/MongoDBConfigServerCluster.java    |  35 +
 .../MongoDBConfigServerClusterImpl.java         |  57 ++
 .../sharding/MongoDBConfigServerDriver.java     |  25 +
 .../sharding/MongoDBConfigServerImpl.java       |  36 +
 .../sharding/MongoDBConfigServerSshDriver.java  |  44 ++
 .../nosql/mongodb/sharding/MongoDBRouter.java   |  52 ++
 .../mongodb/sharding/MongoDBRouterCluster.java  |  54 ++
 .../sharding/MongoDBRouterClusterImpl.java      | 101 +++
 .../mongodb/sharding/MongoDBRouterDriver.java   |  25 +
 .../mongodb/sharding/MongoDBRouterImpl.java     |  86 +++
 .../sharding/MongoDBRouterSshDriver.java        |  52 ++
 .../mongodb/sharding/MongoDBShardCluster.java   |  27 +
 .../sharding/MongoDBShardClusterImpl.java       | 179 +++++
 .../sharding/MongoDBShardedDeployment.java      | 103 +++
 .../sharding/MongoDBShardedDeploymentImpl.java  | 147 ++++
 .../entity/nosql/redis/RedisCluster.java        |  41 ++
 .../entity/nosql/redis/RedisClusterImpl.java    | 130 ++++
 .../brooklyn/entity/nosql/redis/RedisShard.java |  26 +
 .../entity/nosql/redis/RedisShardImpl.java      |  26 +
 .../brooklyn/entity/nosql/redis/RedisSlave.java |  42 ++
 .../entity/nosql/redis/RedisSlaveImpl.java      |  34 +
 .../brooklyn/entity/nosql/redis/RedisStore.java |  69 ++
 .../entity/nosql/redis/RedisStoreDriver.java    |  27 +
 .../entity/nosql/redis/RedisStoreImpl.java      | 154 +++++
 .../entity/nosql/redis/RedisStoreSshDriver.java | 131 ++++
 .../brooklyn/entity/nosql/riak/RiakCluster.java |  65 ++
 .../entity/nosql/riak/RiakClusterImpl.java      | 264 +++++++
 .../brooklyn/entity/nosql/riak/RiakNode.java    | 238 +++++++
 .../entity/nosql/riak/RiakNodeDriver.java       |  48 ++
 .../entity/nosql/riak/RiakNodeImpl.java         | 306 +++++++++
 .../entity/nosql/riak/RiakNodeSshDriver.java    | 614 +++++++++++++++++
 .../brooklyn/entity/nosql/solr/SolrServer.java  |  81 +++
 .../entity/nosql/solr/SolrServerDriver.java     |  30 +
 .../entity/nosql/solr/SolrServerImpl.java       |  75 ++
 .../entity/nosql/solr/SolrServerSshDriver.java  | 158 +++++
 .../entity/nosql/cassandra/cassandra-1.2.yaml   | 644 -----------------
 .../entity/nosql/cassandra/cassandra-2.0.yaml   | 688 -------------------
 .../cassandra/cassandra-multicloud-snitch.jar   | Bin 4729 -> 0 bytes
 .../cassandra/cassandra-multicloud-snitch.txt   |  33 -
 .../nosql/cassandra/cassandra-rackdc.properties |   6 -
 .../entity/nosql/couchbase/pillowfight.yaml     |  77 ---
 .../brooklyn/entity/nosql/couchdb/couch.ini     |  17 -
 .../brooklyn/entity/nosql/couchdb/couch.uri     |   2 -
 .../entity/nosql/mongodb/default-mongod.conf    |   7 -
 .../brooklyn/entity/nosql/mongodb/default.conf  |   2 -
 .../brooklyn/entity/nosql/redis/redis.conf      |  13 -
 .../brooklyn/entity/nosql/redis/slave.conf      |  16 -
 .../brooklyn/entity/nosql/riak/app.config       | 353 ----------
 .../nosql/riak/riak-cluster-with-solr.yaml      |  35 -
 .../brooklyn/entity/nosql/riak/riak-mac.conf    | 494 -------------
 .../nosql/riak/riak-with-webapp-cluster.yaml    |  42 --
 .../entity/nosql/riak/riak-with-webapp.yaml     |  36 -
 .../brooklyn/entity/nosql/riak/riak.conf        | 494 -------------
 .../brooklyn/entity/nosql/riak/riak.md          |  67 --
 .../brooklyn/entity/nosql/riak/riak.png         | Bin 110651 -> 0 bytes
 .../brooklyn/entity/nosql/riak/vm.args          |  64 --
 .../brooklyn/entity/nosql/solr/solr.xml         |  19 -
 .../entity/nosql/cassandra/cassandra-1.2.yaml   | 644 +++++++++++++++++
 .../entity/nosql/cassandra/cassandra-2.0.yaml   | 688 +++++++++++++++++++
 .../cassandra/cassandra-multicloud-snitch.jar   | Bin 0 -> 4729 bytes
 .../cassandra/cassandra-multicloud-snitch.txt   |  33 +
 .../nosql/cassandra/cassandra-rackdc.properties |   6 +
 .../entity/nosql/couchbase/pillowfight.yaml     |  77 +++
 .../brooklyn/entity/nosql/couchdb/couch.ini     |  17 +
 .../brooklyn/entity/nosql/couchdb/couch.uri     |   2 +
 .../entity/nosql/mongodb/default-mongod.conf    |   7 +
 .../brooklyn/entity/nosql/mongodb/default.conf  |   2 +
 .../brooklyn/entity/nosql/redis/redis.conf      |  13 +
 .../brooklyn/entity/nosql/redis/slave.conf      |  16 +
 .../brooklyn/entity/nosql/riak/app.config       | 353 ++++++++++
 .../nosql/riak/riak-cluster-with-solr.yaml      |  35 +
 .../brooklyn/entity/nosql/riak/riak-mac.conf    | 494 +++++++++++++
 .../nosql/riak/riak-with-webapp-cluster.yaml    |  42 ++
 .../entity/nosql/riak/riak-with-webapp.yaml     |  36 +
 .../apache/brooklyn/entity/nosql/riak/riak.conf | 494 +++++++++++++
 .../apache/brooklyn/entity/nosql/riak/riak.md   |  67 ++
 .../apache/brooklyn/entity/nosql/riak/riak.png  | Bin 0 -> 110651 bytes
 .../apache/brooklyn/entity/nosql/riak/vm.args   |  64 ++
 .../apache/brooklyn/entity/nosql/solr/solr.xml  |  19 +
 .../cassandra/AbstractCassandraNodeTest.java    |  41 --
 .../entity/nosql/cassandra/AstyanaxSupport.java | 330 ---------
 .../CassandraDatacenterIntegrationTest.java     | 149 ----
 .../cassandra/CassandraDatacenterLiveTest.java  | 308 ---------
 ...assandraDatacenterRebindIntegrationTest.java |  97 ---
 .../cassandra/CassandraDatacenterTest.java      | 233 -------
 .../nosql/cassandra/CassandraFabricTest.java    | 184 -----
 .../cassandra/CassandraNodeEc2LiveTest.java     |  50 --
 .../cassandra/CassandraNodeIntegrationTest.java | 190 -----
 .../nosql/cassandra/CassandraNodeLiveTest.java  |  74 --
 .../cassandra/NonNegTokenGeneratorTest.java     | 117 ----
 .../cassandra/PosNegTokenGeneratorTest.java     |  58 --
 .../nosql/couchbase/CouchbaseOfflineTest.java   |  62 --
 .../CouchbaseSyncGatewayEc2LiveTest.java        | 137 ----
 .../nosql/couchdb/AbstractCouchDBNodeTest.java  |  59 --
 .../nosql/couchdb/CouchDBClusterLiveTest.java   |  90 ---
 .../nosql/couchdb/CouchDBNodeEc2LiveTest.java   |  49 --
 .../couchdb/CouchDBNodeIntegrationTest.java     |  66 --
 .../nosql/couchdb/CouchDBNodeLiveTest.java      |  74 --
 .../entity/nosql/couchdb/JcouchdbSupport.java   |  77 ---
 .../ElasticSearchClusterIntegrationTest.java    | 128 ----
 .../ElasticSearchNodeIntegrationTest.java       | 112 ---
 .../nosql/mongodb/MongoDBEc2LiveTest.java       |  54 --
 .../nosql/mongodb/MongoDBIntegrationTest.java   |  91 ---
 .../mongodb/MongoDBRebindIntegrationTest.java   |  60 --
 .../mongodb/MongoDBReplicaSetEc2LiveTest.java   |  96 ---
 .../MongoDBReplicaSetIntegrationTest.java       | 206 ------
 .../mongodb/MongoDBRestartIntegrationTest.java  |  42 --
 .../nosql/mongodb/MongoDBSoftLayerLiveTest.java |  56 --
 .../entity/nosql/mongodb/MongoDBTestHelper.java | 124 ----
 .../nosql/mongodb/ReplicaSetConfigTest.java     | 239 -------
 .../MongoDBConfigServerIntegrationTest.java     |  66 --
 .../MongoDBShardedDeploymentEc2LiveTest.java    |  83 ---
 ...MongoDBShardedDeploymentIntegrationTest.java | 129 ----
 .../entity/nosql/redis/JedisSupport.java        |  74 --
 .../redis/RedisClusterIntegrationTest.java      | 109 ---
 .../entity/nosql/redis/RedisEc2LiveTest.java    |  66 --
 .../nosql/redis/RedisIntegrationTest.java       | 119 ----
 .../nosql/riak/RiakClusterEc2LiveTest.java      |  74 --
 .../entity/nosql/riak/RiakNodeEc2LiveTest.java  |  51 --
 .../riak/RiakNodeGoogleComputeLiveTest.java     |  62 --
 .../nosql/riak/RiakNodeIntegrationTest.java     |  64 --
 .../nosql/riak/RiakNodeSoftlayerLiveTest.java   |  45 --
 .../nosql/solr/AbstractSolrServerTest.java      |  41 --
 .../entity/nosql/solr/SolrJSupport.java         |  66 --
 .../nosql/solr/SolrServerEc2LiveTest.java       |  66 --
 .../nosql/solr/SolrServerIntegrationTest.java   |  84 ---
 .../entity/nosql/solr/SolrServerLiveTest.java   |  89 ---
 .../cassandra/AbstractCassandraNodeTest.java    |  42 ++
 .../entity/nosql/cassandra/AstyanaxSupport.java | 331 +++++++++
 .../CassandraDatacenterIntegrationTest.java     | 151 ++++
 .../cassandra/CassandraDatacenterLiveTest.java  | 310 +++++++++
 ...assandraDatacenterRebindIntegrationTest.java |  99 +++
 .../cassandra/CassandraDatacenterTest.java      | 235 +++++++
 .../nosql/cassandra/CassandraFabricTest.java    | 186 +++++
 .../cassandra/CassandraNodeEc2LiveTest.java     |  51 ++
 .../cassandra/CassandraNodeIntegrationTest.java | 191 +++++
 .../nosql/cassandra/CassandraNodeLiveTest.java  |  75 ++
 .../cassandra/NonNegTokenGeneratorTest.java     | 116 ++++
 .../cassandra/PosNegTokenGeneratorTest.java     |  57 ++
 .../nosql/couchbase/CouchbaseOfflineTest.java   |  63 ++
 .../CouchbaseSyncGatewayEc2LiveTest.java        | 140 ++++
 .../nosql/couchdb/AbstractCouchDBNodeTest.java  |  60 ++
 .../nosql/couchdb/CouchDBClusterLiveTest.java   |  92 +++
 .../nosql/couchdb/CouchDBNodeEc2LiveTest.java   |  50 ++
 .../couchdb/CouchDBNodeIntegrationTest.java     |  67 ++
 .../nosql/couchdb/CouchDBNodeLiveTest.java      |  75 ++
 .../entity/nosql/couchdb/JcouchdbSupport.java   |  78 +++
 .../ElasticSearchClusterIntegrationTest.java    | 130 ++++
 .../ElasticSearchNodeIntegrationTest.java       | 113 +++
 .../nosql/mongodb/MongoDBEc2LiveTest.java       |  56 ++
 .../nosql/mongodb/MongoDBIntegrationTest.java   |  92 +++
 .../mongodb/MongoDBRebindIntegrationTest.java   |  61 ++
 .../mongodb/MongoDBReplicaSetEc2LiveTest.java   |  98 +++
 .../MongoDBReplicaSetIntegrationTest.java       | 208 ++++++
 .../mongodb/MongoDBRestartIntegrationTest.java  |  43 ++
 .../nosql/mongodb/MongoDBSoftLayerLiveTest.java |  57 ++
 .../entity/nosql/mongodb/MongoDBTestHelper.java | 126 ++++
 .../nosql/mongodb/ReplicaSetConfigTest.java     | 240 +++++++
 .../MongoDBConfigServerIntegrationTest.java     |  67 ++
 .../MongoDBShardedDeploymentEc2LiveTest.java    |  86 +++
 ...MongoDBShardedDeploymentIntegrationTest.java | 135 ++++
 .../entity/nosql/redis/JedisSupport.java        |  77 +++
 .../redis/RedisClusterIntegrationTest.java      | 112 +++
 .../entity/nosql/redis/RedisEc2LiveTest.java    |  67 ++
 .../nosql/redis/RedisIntegrationTest.java       | 120 ++++
 .../nosql/riak/RiakClusterEc2LiveTest.java      |  76 ++
 .../entity/nosql/riak/RiakNodeEc2LiveTest.java  |  52 ++
 .../riak/RiakNodeGoogleComputeLiveTest.java     |  64 ++
 .../nosql/riak/RiakNodeIntegrationTest.java     |  65 ++
 .../nosql/riak/RiakNodeSoftlayerLiveTest.java   |  46 ++
 .../nosql/solr/AbstractSolrServerTest.java      |  42 ++
 .../entity/nosql/solr/SolrJSupport.java         |  67 ++
 .../nosql/solr/SolrServerEc2LiveTest.java       |  67 ++
 .../nosql/solr/SolrServerIntegrationTest.java   |  85 +++
 .../entity/nosql/solr/SolrServerLiveTest.java   |  90 +++
 .../main/resources/brooklyn/default.catalog.bom |   2 +-
 .../src/test/resources/cassandra-blueprint.yaml |   2 +-
 .../resources/couchbase-cluster-singleNode.yaml |   2 +-
 .../src/test/resources/couchbase-cluster.yaml   |   2 +-
 .../src/test/resources/couchbase-node.yaml      |   2 +-
 .../couchbase-replication-w-pillowfight.yaml    |   6 +-
 .../src/test/resources/couchbase-w-loadgen.yaml |   4 +-
 .../test/resources/couchbase-w-pillowfight.yaml |   4 +-
 .../src/test/resources/mongo-blueprint.yaml     |   2 +-
 .../resources/mongo-client-single-server.yaml   |   4 +-
 .../src/test/resources/mongo-scripts.yaml       |   4 +-
 .../src/test/resources/mongo-sharded.yaml       |   4 +-
 .../mongo-single-server-blueprint.yaml          |   2 +-
 usage/launcher/src/test/resources/playing.yaml  |   2 +-
 .../ApplicationResourceIntegrationTest.java     |   4 +-
 .../ApplicationResourceIntegrationTest.java     |   2 +-
 .../rest/resources/CatalogResourceTest.java     |   6 +-
 349 files changed, 19879 insertions(+), 19793 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/docs/_extra/big_examples/nosql-cassandra/cassandra.include.md
----------------------------------------------------------------------
diff --git a/docs/_extra/big_examples/nosql-cassandra/cassandra.include.md b/docs/_extra/big_examples/nosql-cassandra/cassandra.include.md
index 56319f8..a4d1643 100644
--- a/docs/_extra/big_examples/nosql-cassandra/cassandra.include.md
+++ b/docs/_extra/big_examples/nosql-cassandra/cassandra.include.md
@@ -189,7 +189,7 @@ public class WideAreaCassandraCluster extends AbstractApplication {
         .configure(CassandraCluster.CLUSTER_NAME, "Brooklyn")
         .configure(CassandraCluster.INITIAL_SIZE, 2) // per location
         .configure(CassandraCluster.ENDPOINT_SNITCH_NAME, "brooklyn.entity.nosql.cassandra.customsnitch.MultiCloudSnitch")
-        .configure(CassandraNode.CUSTOM_SNITCH_JAR_URL, "classpath://brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar"));
+        .configure(CassandraNode.CUSTOM_SNITCH_JAR_URL, "classpath://org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar"));
   }
 }
 {% endhighlight %}
@@ -203,7 +203,7 @@ public class WideAreaCassandraCluster extends AbstractApplication {
         .configure(CassandraCluster.CLUSTER_NAME, "Brooklyn")
         .configure(CassandraCluster.INITIAL_SIZE, 2) // per location
         .configure(CassandraCluster.ENDPOINT_SNITCH_NAME, "brooklyn.entity.nosql.cassandra.customsnitch.MultiCloudSnitch")
-        .configure(CassandraNode.CUSTOM_SNITCH_JAR_URL, "classpath://brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar")
+        .configure(CassandraNode.CUSTOM_SNITCH_JAR_URL, "classpath://org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar")
         .configure(CassandraFabric.MEMBER_SPEC, EntitySpec.create(CassandraCluster.class)
             .configure(CassandraCluster.MEMBER_SPEC, EntitySpec.create(CassandraNode.class)
                 .policy(PolicySpec.create(ServiceFailureDetector.class))

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/docs/guide/ops/catalog/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/ops/catalog/index.md b/docs/guide/ops/catalog/index.md
index d24e200..9a65448 100644
--- a/docs/guide/ops/catalog/index.md
+++ b/docs/guide/ops/catalog/index.md
@@ -141,7 +141,7 @@ brooklyn.catalog:
   id: datastore
   version: 1.0
   itemType: template
-  iconUrl: classpath://brooklyn/entity/nosql/riak/riak.png
+  iconUrl: classpath://org/apache/brooklyn/entity/nosql/riak/riak.png
   name: Datastore (Riak)
   description: Riak is an open-source NoSQL key-value data store.
   item:
@@ -157,7 +157,7 @@ This YAML will install three items:
 ~~~ yaml
 brooklyn.catalog:
   version: 1.1
-  iconUrl: classpath://brooklyn/entity/nosql/riak/riak.png
+  iconUrl: classpath://org/apache/brooklyn/entity/nosql/riak/riak.png
   description: Riak is an open-source NoSQL key-value data store.
   items:
     - id: riak-node

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java
index 5b521bd..b62c028 100644
--- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java
+++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java
@@ -27,6 +27,10 @@ import org.slf4j.LoggerFactory;
 
 import org.apache.brooklyn.catalog.Catalog;
 import org.apache.brooklyn.catalog.CatalogConfig;
+import org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter;
+import org.apache.brooklyn.entity.nosql.cassandra.CassandraFabric;
+import org.apache.brooklyn.entity.nosql.cassandra.CassandraNode;
+
 import brooklyn.config.ConfigKey;
 import brooklyn.entity.Effector;
 import brooklyn.entity.Entity;
@@ -41,9 +45,6 @@ import brooklyn.entity.effector.EffectorBody;
 import brooklyn.entity.effector.Effectors;
 import brooklyn.entity.java.UsesJava;
 import brooklyn.entity.java.UsesJmx;
-import brooklyn.entity.nosql.cassandra.CassandraDatacenter;
-import brooklyn.entity.nosql.cassandra.CassandraFabric;
-import brooklyn.entity.nosql.cassandra.CassandraNode;
 import brooklyn.entity.proxying.EntitySpec;
 import brooklyn.entity.software.SshEffectorTasks;
 import brooklyn.entity.trait.Startable;
@@ -138,8 +139,8 @@ public class CumulusRDFApplication extends AbstractApplication {
             cassandra = addChild(EntitySpec.create(CassandraFabric.class)
                     .configure(CassandraDatacenter.CLUSTER_NAME, "Brooklyn")
                     .configure(CassandraDatacenter.INITIAL_SIZE, getConfig(CASSANDRA_CLUSTER_SIZE)) // per location
-                    .configure(CassandraDatacenter.ENDPOINT_SNITCH_NAME, "brooklyn.entity.nosql.cassandra.customsnitch.MultiCloudSnitch")
-                    .configure(CassandraNode.CUSTOM_SNITCH_JAR_URL, "classpath://brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar")
+                    .configure(CassandraDatacenter.ENDPOINT_SNITCH_NAME, "org.apache.brooklyn.entity.nosql.cassandra.customsnitch.MultiCloudSnitch")
+                    .configure(CassandraNode.CUSTOM_SNITCH_JAR_URL, "classpath://org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar")
                     .configure(CassandraFabric.MEMBER_SPEC, clusterSpec));
         } else {
             cassandra = addChild(EntitySpec.create(clusterSpec)

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java
index a380798..4328269 100644
--- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java
+++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java
@@ -22,13 +22,14 @@ import java.util.List;
 
 import org.apache.brooklyn.catalog.Catalog;
 import org.apache.brooklyn.catalog.CatalogConfig;
+import org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter;
+import org.apache.brooklyn.entity.nosql.cassandra.CassandraNode;
+
 import brooklyn.config.ConfigKey;
 import brooklyn.entity.basic.AbstractApplication;
 import brooklyn.entity.basic.ConfigKeys;
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.StartableApplication;
-import brooklyn.entity.nosql.cassandra.CassandraDatacenter;
-import brooklyn.entity.nosql.cassandra.CassandraNode;
 import brooklyn.entity.proxying.EntitySpec;
 import brooklyn.launcher.BrooklynLauncher;
 import brooklyn.policy.EnricherSpec;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/ResilientMongoDbApp.java
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/ResilientMongoDbApp.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/ResilientMongoDbApp.java
index 3824502..2af0a81 100644
--- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/ResilientMongoDbApp.java
+++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/ResilientMongoDbApp.java
@@ -24,6 +24,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.brooklyn.catalog.Catalog;
+import org.apache.brooklyn.entity.nosql.mongodb.MongoDBReplicaSet;
+import org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer;
+
 import brooklyn.enricher.Enrichers;
 import brooklyn.entity.Entity;
 import brooklyn.entity.basic.AbstractApplication;
@@ -31,8 +34,6 @@ import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.SoftwareProcess;
 import brooklyn.entity.basic.StartableApplication;
 import brooklyn.entity.group.DynamicCluster;
-import brooklyn.entity.nosql.mongodb.MongoDBReplicaSet;
-import brooklyn.entity.nosql.mongodb.MongoDBServer;
 import brooklyn.entity.proxying.EntitySpec;
 import brooklyn.event.SensorEvent;
 import brooklyn.event.SensorEventListener;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java
index 1d61a45..fe5edc9 100644
--- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java
+++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java
@@ -22,13 +22,14 @@ import java.util.List;
 
 import org.apache.brooklyn.catalog.Catalog;
 import org.apache.brooklyn.catalog.CatalogConfig;
+import org.apache.brooklyn.entity.nosql.riak.RiakCluster;
+import org.apache.brooklyn.entity.nosql.riak.RiakNode;
+
 import brooklyn.config.ConfigKey;
 import brooklyn.entity.basic.AbstractApplication;
 import brooklyn.entity.basic.ConfigKeys;
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.StartableApplication;
-import brooklyn.entity.nosql.riak.RiakCluster;
-import brooklyn.entity.nosql.riak.RiakNode;
 import brooklyn.entity.proxying.EntitySpec;
 import brooklyn.launcher.BrooklynLauncher;
 import brooklyn.policy.EnricherSpec;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCassandraCluster.java
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCassandraCluster.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCassandraCluster.java
index 2ba6ba3..fe9059f 100644
--- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCassandraCluster.java
+++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCassandraCluster.java
@@ -20,10 +20,11 @@ package org.apache.brooklyn.demo;
 
 import java.util.List;
 
+import org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter;
+
 import brooklyn.entity.basic.AbstractApplication;
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.StartableApplication;
-import brooklyn.entity.nosql.cassandra.CassandraDatacenter;
 import brooklyn.entity.proxying.EntitySpec;
 import brooklyn.launcher.BrooklynLauncher;
 import brooklyn.util.CommandLineUtil;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCouchDBCluster.java
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCouchDBCluster.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCouchDBCluster.java
index 0919c24..9fef1af 100644
--- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCouchDBCluster.java
+++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCouchDBCluster.java
@@ -18,8 +18,9 @@
  */
 package org.apache.brooklyn.demo;
 
+import org.apache.brooklyn.entity.nosql.couchdb.CouchDBCluster;
+
 import brooklyn.entity.basic.ApplicationBuilder;
-import brooklyn.entity.nosql.couchdb.CouchDBCluster;
 import brooklyn.entity.proxying.EntitySpec;
 
 /** CouchDB cluster. */

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleMongoDBReplicaSet.java
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleMongoDBReplicaSet.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleMongoDBReplicaSet.java
index 249431c..a24cf4d 100644
--- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleMongoDBReplicaSet.java
+++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleMongoDBReplicaSet.java
@@ -18,9 +18,10 @@
  */
 package org.apache.brooklyn.demo;
 
+import org.apache.brooklyn.entity.nosql.mongodb.MongoDBReplicaSet;
+import org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer;
+
 import brooklyn.entity.basic.ApplicationBuilder;
-import brooklyn.entity.nosql.mongodb.MongoDBReplicaSet;
-import brooklyn.entity.nosql.mongodb.MongoDBServer;
 import brooklyn.entity.proxying.EntitySpec;
 
 public class SimpleMongoDBReplicaSet extends ApplicationBuilder {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleRedisCluster.java
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleRedisCluster.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleRedisCluster.java
index 96268c3..27acc35 100644
--- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleRedisCluster.java
+++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleRedisCluster.java
@@ -18,8 +18,9 @@
  */
 package org.apache.brooklyn.demo;
 
+import org.apache.brooklyn.entity.nosql.redis.RedisCluster;
+
 import brooklyn.entity.basic.ApplicationBuilder;
-import brooklyn.entity.nosql.redis.RedisCluster;
 import brooklyn.entity.proxying.EntitySpec;
 
 /** Redis cluster. */

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java
index 21156e8..6116d13 100644
--- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java
+++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java
@@ -23,14 +23,15 @@ import java.util.List;
 
 import org.apache.brooklyn.catalog.Catalog;
 import org.apache.brooklyn.catalog.CatalogConfig;
+import org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter;
+import org.apache.brooklyn.entity.nosql.cassandra.CassandraFabric;
+import org.apache.brooklyn.entity.nosql.cassandra.CassandraNode;
+
 import brooklyn.config.ConfigKey;
 import brooklyn.entity.basic.AbstractApplication;
 import brooklyn.entity.basic.ConfigKeys;
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.StartableApplication;
-import brooklyn.entity.nosql.cassandra.CassandraDatacenter;
-import brooklyn.entity.nosql.cassandra.CassandraFabric;
-import brooklyn.entity.nosql.cassandra.CassandraNode;
 import brooklyn.entity.proxying.EntitySpec;
 import brooklyn.launcher.BrooklynLauncher;
 import brooklyn.policy.EnricherSpec;
@@ -58,8 +59,8 @@ public class WideAreaCassandraCluster extends AbstractApplication {
         addChild(EntitySpec.create(CassandraFabric.class)
                 .configure(CassandraDatacenter.CLUSTER_NAME, "Brooklyn")
                 .configure(CassandraDatacenter.INITIAL_SIZE, getConfig(CASSANDRA_CLUSTER_SIZE)) // per location
-                .configure(CassandraDatacenter.ENDPOINT_SNITCH_NAME, "brooklyn.entity.nosql.cassandra.customsnitch.MultiCloudSnitch")
-                .configure(CassandraNode.CUSTOM_SNITCH_JAR_URL, "classpath://brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar")
+                .configure(CassandraDatacenter.ENDPOINT_SNITCH_NAME, "org.apache.brooklyn.entity.nosql.cassandra.customsnitch.MultiCloudSnitch")
+                .configure(CassandraNode.CUSTOM_SNITCH_JAR_URL, "classpath://org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar")
                 .configure(CassandraFabric.MEMBER_SPEC, EntitySpec.create(CassandraDatacenter.class)
                         .configure(CassandraDatacenter.MEMBER_SPEC, EntitySpec.create(CassandraNode.class)
                                 .enricher(EnricherSpec.create(ServiceFailureDetector.class))

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/examples/simple-nosql-cluster/src/main/resources/org/apache/brooklyn/demo/ha-cassandra-cluster.yaml
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/src/main/resources/org/apache/brooklyn/demo/ha-cassandra-cluster.yaml b/examples/simple-nosql-cluster/src/main/resources/org/apache/brooklyn/demo/ha-cassandra-cluster.yaml
index 4a9ebc7..d1c6ab4 100644
--- a/examples/simple-nosql-cluster/src/main/resources/org/apache/brooklyn/demo/ha-cassandra-cluster.yaml
+++ b/examples/simple-nosql-cluster/src/main/resources/org/apache/brooklyn/demo/ha-cassandra-cluster.yaml
@@ -22,7 +22,7 @@ name: HA Cassandra cluster
 location: aws-ec2:us-east-1
 
 services:
-- type: brooklyn.entity.nosql.cassandra.CassandraDatacenter
+- type: org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter
   name: Brooklyn
   brooklyn.config:
     initialSize: 6
@@ -36,7 +36,7 @@ services:
     snitchName: GossipingPropertyFileSnitch
     memberSpec:
       $brooklyn:entitySpec:
-        type: brooklyn.entity.nosql.cassandra.CassandraNode
+        type: org.apache.brooklyn.entity.nosql.cassandra.CassandraNode
         brookyn.policies:
         - type: brooklyn.policy.ha.ServiceRestarter
         brooklyn.enrichers:

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/examples/simple-nosql-cluster/src/main/resources/org/apache/brooklyn/demo/simple-cassandra-cluster.yaml
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/src/main/resources/org/apache/brooklyn/demo/simple-cassandra-cluster.yaml b/examples/simple-nosql-cluster/src/main/resources/org/apache/brooklyn/demo/simple-cassandra-cluster.yaml
index ff7b48c..346ea78 100644
--- a/examples/simple-nosql-cluster/src/main/resources/org/apache/brooklyn/demo/simple-cassandra-cluster.yaml
+++ b/examples/simple-nosql-cluster/src/main/resources/org/apache/brooklyn/demo/simple-cassandra-cluster.yaml
@@ -22,7 +22,7 @@ name: Simple Cassandra cluster
 location: localhost
 
 services:
-- type: brooklyn.entity.nosql.cassandra.CassandraDatacenter
+- type: org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter
   name: Brooklyn
   brooklyn.config:
     initialSize: 1

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/examples/simple-nosql-cluster/src/main/resources/org/apache/brooklyn/demo/wide-area-cassandra-cluster.yaml
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/src/main/resources/org/apache/brooklyn/demo/wide-area-cassandra-cluster.yaml b/examples/simple-nosql-cluster/src/main/resources/org/apache/brooklyn/demo/wide-area-cassandra-cluster.yaml
index 3e44e39..0cf39da 100644
--- a/examples/simple-nosql-cluster/src/main/resources/org/apache/brooklyn/demo/wide-area-cassandra-cluster.yaml
+++ b/examples/simple-nosql-cluster/src/main/resources/org/apache/brooklyn/demo/wide-area-cassandra-cluster.yaml
@@ -24,15 +24,15 @@ locations:
 - rackspace-cloudservers-uk
 
 services:
-- type: brooklyn.entity.nosql.cassandra.CassandraFabric
+- type: org.apache.brooklyn.entity.nosql.cassandra.CassandraFabric
   name: Brooklyn
   brooklyn.config:
     initialSize: 2
-    snitchName: brooklyn.entity.nosql.cassandra.customsnitch.MultiCloudSnitch
-    customSnitchJarUrl: classpath://brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar
+    snitchName: org.apache.brooklyn.entity.nosql.cassandra.customsnitch.MultiCloudSnitch
+    customSnitchJarUrl: classpath://org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar
     memberSpec:
       $brooklyn:entitySpec:
-        type: brooklyn.entity.nosql.cassandra.CassandraNode
+        type: org.apache.brooklyn.entity.nosql.cassandra.CassandraNode
         brookyn.policies:
         - type: brooklyn.policy.ha.ServiceRestarter
         brooklyn.enrichers:

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/NodeJsTodoApplication.java
----------------------------------------------------------------------
diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/NodeJsTodoApplication.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/NodeJsTodoApplication.java
index 7ae1afd..993b549 100644
--- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/NodeJsTodoApplication.java
+++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/NodeJsTodoApplication.java
@@ -20,11 +20,12 @@ package org.apache.brooklyn.demo;
 
 import static brooklyn.event.basic.DependentConfiguration.attributeWhenReady;
 import org.apache.brooklyn.catalog.Catalog;
+import org.apache.brooklyn.entity.nosql.redis.RedisStore;
+
 import brooklyn.entity.basic.AbstractApplication;
 import brooklyn.entity.basic.Attributes;
 import brooklyn.entity.basic.SoftwareProcess;
 import brooklyn.entity.basic.StartableApplication;
-import brooklyn.entity.nosql.redis.RedisStore;
 import brooklyn.entity.proxying.EntitySpec;
 import brooklyn.entity.trait.Startable;
 import brooklyn.entity.webapp.nodejs.NodeJsWebAppService;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/examples/simple-web-cluster/src/main/resources/org/apache/brooklyn/demo/nodejs-riak-todo.yaml
----------------------------------------------------------------------
diff --git a/examples/simple-web-cluster/src/main/resources/org/apache/brooklyn/demo/nodejs-riak-todo.yaml b/examples/simple-web-cluster/src/main/resources/org/apache/brooklyn/demo/nodejs-riak-todo.yaml
index d963671..7cdf546 100644
--- a/examples/simple-web-cluster/src/main/resources/org/apache/brooklyn/demo/nodejs-riak-todo.yaml
+++ b/examples/simple-web-cluster/src/main/resources/org/apache/brooklyn/demo/nodejs-riak-todo.yaml
@@ -21,7 +21,7 @@ location:
   jclouds:aws-ec2:us-west-1:
     imageId: us-west-1/ami-c33cdd87
 services:
-- type: brooklyn.entity.nosql.riak.RiakCluster
+- type: org.apache.brooklyn.entity.nosql.riak.RiakCluster
   initialSize: 2
   id: mycluster
   brooklyn.config:

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/examples/simple-web-cluster/src/main/resources/org/apache/brooklyn/demo/nodejs-todo.yaml
----------------------------------------------------------------------
diff --git a/examples/simple-web-cluster/src/main/resources/org/apache/brooklyn/demo/nodejs-todo.yaml b/examples/simple-web-cluster/src/main/resources/org/apache/brooklyn/demo/nodejs-todo.yaml
index ea17556..82bc686 100644
--- a/examples/simple-web-cluster/src/main/resources/org/apache/brooklyn/demo/nodejs-todo.yaml
+++ b/examples/simple-web-cluster/src/main/resources/org/apache/brooklyn/demo/nodejs-todo.yaml
@@ -21,7 +21,7 @@ origin: "https://github.com/amirrajan/nodejs-todo/"
 locations:
 - jclouds:softlayer:ams01
 services:
-- type: brooklyn.entity.nosql.redis.RedisStore
+- type: org.apache.brooklyn.entity.nosql.redis.RedisStore
   id: redis
   name: "Redis"
 - type: brooklyn.entity.webapp.nodejs.NodeJsWebAppService

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index 2c9bd22..8acbc95 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -255,23 +255,23 @@
                     the given components. These are files "without any degree of creativity" from the
                     perspective of the Brooklyn/Apache contribution.
                 -->
-                <exclude>src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-1.2.yaml</exclude>
-                <exclude>src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-2.0.yaml</exclude>
-                <exclude>src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-rackdc.properties</exclude>
-                <exclude>src/main/resources/brooklyn/entity/nosql/couchdb/couch.ini</exclude>
-                <exclude>src/main/resources/brooklyn/entity/nosql/couchdb/couch.uri</exclude>
-                <exclude>src/main/resources/brooklyn/entity/nosql/mongodb/default.conf</exclude>
-                <exclude>src/main/resources/brooklyn/entity/nosql/mongodb/default-mongod.conf</exclude>
+                <exclude>src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cassandra-1.2.yaml</exclude>
+                <exclude>src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cassandra-2.0.yaml</exclude>
+                <exclude>src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cassandra-rackdc.properties</exclude>
+                <exclude>src/main/resources/org/apache/brooklyn/entity/nosql/couchdb/couch.ini</exclude>
+                <exclude>src/main/resources/org/apache/brooklyn/entity/nosql/couchdb/couch.uri</exclude>
+                <exclude>src/main/resources/org/apache/brooklyn/entity/nosql/mongodb/default.conf</exclude>
+                <exclude>src/main/resources/org/apache/brooklyn/entity/nosql/mongodb/default-mongod.conf</exclude>
                 <exclude>src/test/resources/test-mongodb.conf</exclude>
                 <exclude>src/test/resources/test-mongodb-configserver.conf</exclude>
                 <exclude>src/test/resources/test-mongodb-router.conf</exclude>
-                <exclude>src/main/resources/brooklyn/entity/nosql/redis/redis.conf</exclude>
-                <exclude>src/main/resources/brooklyn/entity/nosql/redis/slave.conf</exclude>
-                <exclude>src/main/resources/brooklyn/entity/nosql/riak/app.config</exclude>
-                <exclude>src/main/resources/brooklyn/entity/nosql/riak/vm.args</exclude>
-                <exclude>src/main/resources/brooklyn/entity/nosql/riak/riak.conf</exclude>
-                <exclude>src/main/resources/brooklyn/entity/nosql/riak/riak-mac.conf</exclude>
-                <exclude>src/main/resources/brooklyn/entity/nosql/solr/solr.xml</exclude>
+                <exclude>src/main/resources/org/apache/brooklyn/entity/nosql/redis/redis.conf</exclude>
+                <exclude>src/main/resources/org/apache/brooklyn/entity/nosql/redis/slave.conf</exclude>
+                <exclude>src/main/resources/org/apache/brooklyn/entity/nosql/riak/app.config</exclude>
+                <exclude>src/main/resources/org/apache/brooklyn/entity/nosql/riak/vm.args</exclude>
+                <exclude>src/main/resources/org/apache/brooklyn/entity/nosql/riak/riak.conf</exclude>
+                <exclude>src/main/resources/org/apache/brooklyn/entity/nosql/riak/riak-mac.conf</exclude>
+                <exclude>src/main/resources/org/apache/brooklyn/entity/nosql/solr/solr.xml</exclude>
 
                 <!--
                     The source code for cassandra-multicloud-snitch.jar is in sandbox/cassandra-multicloud-snitch.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraCluster.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraCluster.java b/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraCluster.java
deleted file mode 100644
index afd582a..0000000
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraCluster.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.entity.nosql.cassandra;
-
-import brooklyn.entity.proxying.ImplementedBy;
-
-/**
- * @deprecated since 0.7.0; use {@link CassandraDatacenter} which is equivalent but has
- * a less ambiguous name; <em>Cluster</em> in Cassandra corresponds to what Brooklyn terms a <em>Fabric</em>.
- */
-@Deprecated
-@ImplementedBy(CassandraClusterImpl.class)
-public interface CassandraCluster extends CassandraDatacenter {
-}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraClusterImpl.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraClusterImpl.java b/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraClusterImpl.java
deleted file mode 100644
index 340a86a..0000000
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraClusterImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.entity.nosql.cassandra;
-
-/**
- * @deprecated since 0.7.0; use {@link CassandraDatacenter} which is equivalent but has
- * a less ambiguous name; <em>Cluster</em> in Cassandra corresponds to what Brooklyn terms a <em>Fabric</em>.
- */
-@Deprecated
-public class CassandraClusterImpl extends CassandraDatacenterImpl implements CassandraCluster {
-}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java b/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java
deleted file mode 100644
index a012692..0000000
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.entity.nosql.cassandra;
-
-import java.math.BigInteger;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.brooklyn.catalog.Catalog;
-import brooklyn.config.ConfigKey;
-import brooklyn.entity.Entity;
-import brooklyn.entity.annotation.Effector;
-import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.entity.basic.MethodEffector;
-import brooklyn.entity.database.DatastoreMixins;
-import brooklyn.entity.effector.Effectors;
-import brooklyn.entity.group.DynamicCluster;
-import brooklyn.entity.nosql.cassandra.TokenGenerators.PosNeg63TokenGenerator;
-import brooklyn.entity.proxying.ImplementedBy;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.basic.BasicAttributeSensorAndConfigKey;
-import brooklyn.event.basic.Sensors;
-import brooklyn.util.flags.SetFromFlag;
-import brooklyn.util.time.Duration;
-
-import com.google.common.base.Supplier;
-import com.google.common.collect.Multimap;
-import com.google.common.reflect.TypeToken;
-
-/**
- * A group of {@link CassandraNode}s -- based on Brooklyn's {@link DynamicCluster} 
- * (though it is a "Datacenter" in Cassandra terms, where Cassandra's "cluster" corresponds
- * to a Brooklyn Fabric, cf {@link CassandraFabric}). 
- * The Datacenter can be resized, manually or by policy if required.
- * Tokens are selected intelligently.
- * <p>
- * Note that due to how Cassandra assumes ports are the same across a cluster,
- * it is <em>NOT</em> possible to deploy a cluster of size larger than 1 to localhost.
- * (Some exploratory work has been done to use different 127.0.0.x IP's for localhost,
- * and there is evidence this could be made to work.)
- */
-@Catalog(name="Apache Cassandra Datacenter Cluster", description="Cassandra is a highly scalable, eventually " +
-        "consistent, distributed, structured key-value store which provides a ColumnFamily-based data model " +
-        "richer than typical key/value systems", iconUrl="classpath:///cassandra-logo.jpeg")
-@ImplementedBy(CassandraDatacenterImpl.class)
-public interface CassandraDatacenter extends DynamicCluster, DatastoreMixins.HasDatastoreUrl, DatastoreMixins.CanExecuteScript {
-
-    // FIXME datacenter name -- also CASS_CLUSTER_NODES should be CASS_DC_NODES
-    @SetFromFlag("clusterName")
-    BasicAttributeSensorAndConfigKey<String> CLUSTER_NAME = new BasicAttributeSensorAndConfigKey<String>(String.class, "cassandra.cluster.name", "Name of the Cassandra cluster", "BrooklynCluster");
-
-    @SetFromFlag("snitchName")
-    ConfigKey<String> ENDPOINT_SNITCH_NAME = ConfigKeys.newStringConfigKey("cassandra.cluster.snitchName", "Type of the Cassandra snitch", "SimpleSnitch");
-
-    @SetFromFlag("seedSupplier")
-    @SuppressWarnings("serial")
-    ConfigKey<Supplier<Set<Entity>>> SEED_SUPPLIER = ConfigKeys.newConfigKey(new TypeToken<Supplier<Set<Entity>>>() { }, "cassandra.cluster.seedSupplier", "For determining the seed nodes", null);
-
-    @SuppressWarnings("serial")
-    @SetFromFlag("tokenGeneratorClass")
-    ConfigKey<Class<? extends TokenGenerator>> TOKEN_GENERATOR_CLASS = ConfigKeys.newConfigKey(
-        new TypeToken<Class<? extends TokenGenerator>>() {}, "cassandra.cluster.tokenGenerator.class", "For determining the tokens of nodes", 
-        PosNeg63TokenGenerator.class);
-
-    @SetFromFlag("tokenShift")
-    ConfigKey<BigInteger> TOKEN_SHIFT = ConfigKeys.newConfigKey(BigInteger.class, "cassandra.cluster.tokenShift", 
-        "Delta applied to all tokens generated for this Cassandra datacenter, "
-        + "useful when configuring multiple datacenters which should be shifted; "
-        + "if not set, a random shift is applied. (Pass 0 to prevent any shift.)", null);
-
-    ConfigKey<Boolean> USE_VNODES = ConfigKeys.newBooleanConfigKey(
-            "cassandra.cluster.useVnodes",
-            "Determines whether to use vnodes; if doing so, tokens will not be explicitly assigned to nodes in the cluster",
-            false);
-
-    /**
-     * num_tokens will automatically be reset to 1 for each node if {@link #USE_VNODES} is false. 
-     */
-    ConfigKey<Integer> NUM_TOKENS_PER_NODE = ConfigKeys.newIntegerConfigKey("cassandra.numTokensPerNode",
-            "Number of tokens per node; if using vnodes, should set this to a value like 256; will be overridden to 1 if USE_VNODES==false",
-            256);
-    
-    /**
-     * Additional time after the nodes in the cluster are up when starting
-     * before announcing the cluster as up.
-     * <p>
-     * Useful to ensure nodes have synchronized.
-     * <p>
-     * On 1.2.2 this could be as much as 120s when using 2 seed nodes,
-     * or just a few seconds with 1 seed node. On 1.2.9 it seems a few
-     * seconds is sufficient even with 2 seed nodes
-     */
-    @SetFromFlag("delayBeforeAdvertisingCluster")
-    ConfigKey<Duration> DELAY_BEFORE_ADVERTISING_CLUSTER = ConfigKeys.newConfigKey(Duration.class, "cassandra.cluster.delayBeforeAdvertisingCluster", "Delay after cluster is started before checking and advertising its availability", Duration.TEN_SECONDS);
-
-    @SuppressWarnings("serial")
-    AttributeSensor<Multimap<String,Entity>> DATACENTER_USAGE = Sensors.newSensor(new TypeToken<Multimap<String,Entity>>() { }, "cassandra.cluster.datacenterUsages", "Current set of datacenters in use, with nodes in each");
-
-    @SuppressWarnings("serial")
-    AttributeSensor<Set<String>> DATACENTERS = Sensors.newSensor(new TypeToken<Set<String>>() { }, "cassandra.cluster.datacenters", "Current set of datacenters in use");
-
-    AttributeSensor<Boolean> HAS_PUBLISHED_SEEDS = Sensors.newBooleanSensor("cassandra.cluster.seeds.hasPublished", "Whether we have published any seeds");
-
-    @SuppressWarnings("serial")
-    AttributeSensor<Set<Entity>> CURRENT_SEEDS = Sensors.newSensor(new TypeToken<Set<Entity>>() { }, "cassandra.cluster.seeds.current", "Current set of seeds to use to bootstrap the cluster");
-
-    AttributeSensor<String> HOSTNAME = Sensors.newStringSensor("cassandra.cluster.hostname", "Hostname to connect to cluster with");
-
-    @SuppressWarnings("serial")
-    AttributeSensor<List<String>> CASSANDRA_CLUSTER_NODES = Sensors.newSensor(new TypeToken<List<String>>() {},
-        "cassandra.cluster.nodes", "List of host:port of all active nodes in the cluster (thrift port, and public hostname/IP)");
-
-    AttributeSensor<Integer> THRIFT_PORT = Sensors.newIntegerSensor("cassandra.cluster.thrift.port", "Cassandra Thrift RPC port to connect to cluster with");
-
-    AttributeSensor<Long> FIRST_NODE_STARTED_TIME_UTC = Sensors.newLongSensor("cassandra.cluster.first.node.started.utc", "Time (UTC) when the first node was started");
-    @SuppressWarnings("serial")
-    AttributeSensor<List<Entity>> QUEUED_START_NODES = Sensors.newSensor(new TypeToken<List<Entity>>() {}, "cassandra.cluster.start.nodes.queued",
-        "Nodes queued for starting (for sequential start)");
-    
-    AttributeSensor<Integer> SCHEMA_VERSION_COUNT = Sensors.newIntegerSensor("cassandra.cluster.schema.versions.count",
-            "Number of different schema versions in the cluster; should be 1 for a healthy cluster, 0 when off; " +
-            "2 and above indicats a Schema Disagreement Error (and keyspace access may fail)");
-
-    AttributeSensor<Long> READ_PENDING = Sensors.newLongSensor("cassandra.cluster.read.pending", "Current pending ReadStage tasks");
-    AttributeSensor<Integer> READ_ACTIVE = Sensors.newIntegerSensor("cassandra.cluster.read.active", "Current active ReadStage tasks");
-    AttributeSensor<Long> WRITE_PENDING = Sensors.newLongSensor("cassandra.cluster.write.pending", "Current pending MutationStage tasks");
-    AttributeSensor<Integer> WRITE_ACTIVE = Sensors.newIntegerSensor("cassandra.cluster.write.active", "Current active MutationStage tasks");
-
-    AttributeSensor<Long> THRIFT_PORT_LATENCY_PER_NODE = Sensors.newLongSensor("cassandra.cluster.thrift.latency.perNode", "Latency for thrift port connection  averaged over all nodes (ms)");
-    AttributeSensor<Double> READS_PER_SECOND_LAST_PER_NODE = Sensors.newDoubleSensor("cassandra.reads.perSec.last.perNode", "Reads/sec (last datapoint) averaged over all nodes");
-    AttributeSensor<Double> WRITES_PER_SECOND_LAST_PER_NODE = Sensors.newDoubleSensor("cassandra.write.perSec.last.perNode", "Writes/sec (last datapoint) averaged over all nodes");
-    AttributeSensor<Double> PROCESS_CPU_TIME_FRACTION_LAST_PER_NODE = Sensors.newDoubleSensor("cassandra.cluster.metrics.processCpuTime.fraction.perNode", "Fraction of CPU time used (percentage reported by JMX), averaged over all nodes");
-
-    AttributeSensor<Double> READS_PER_SECOND_IN_WINDOW_PER_NODE = Sensors.newDoubleSensor("cassandra.reads.perSec.windowed.perNode", "Reads/sec (over time window) averaged over all nodes");
-    AttributeSensor<Double> WRITES_PER_SECOND_IN_WINDOW_PER_NODE = Sensors.newDoubleSensor("cassandra.writes.perSec.windowed.perNode", "Writes/sec (over time window) averaged over all nodes");
-    AttributeSensor<Double> THRIFT_PORT_LATENCY_IN_WINDOW_PER_NODE = Sensors.newDoubleSensor("cassandra.thrift.latency.windowed.perNode", "Latency for thrift port (ms, over time window) averaged over all nodes");
-    AttributeSensor<Double> PROCESS_CPU_TIME_FRACTION_IN_WINDOW_PER_NODE = Sensors.newDoubleSensor("cassandra.cluster.metrics.processCpuTime.fraction.windowed", "Fraction of CPU time used (percentage, over time window), averaged over all nodes");
-
-    MethodEffector<Void> UPDATE = new MethodEffector<Void>(CassandraDatacenter.class, "update");
-
-    brooklyn.entity.Effector<String> EXECUTE_SCRIPT = Effectors.effector(DatastoreMixins.EXECUTE_SCRIPT)
-        .description("executes the given script contents using cassandra-cli")
-        .buildAbstract();
-
-    /**
-     * Sets the number of nodes used to seed the cluster.
-     * <p>
-     * Version 1.2.2 is buggy and requires a big delay for 2 nodes both seeds to reconcile,
-     * with 1.2.9 this seems fine, with just a few seconds' delay after starting.
-     *
-     * @see <a href="http://stackoverflow.com/questions/6770894/schemadisagreementexception/18639005" />
-     */
-    int DEFAULT_SEED_QUORUM = 2;
-
-    /**
-     * Can insert a delay after the first node comes up.
-     * <p>
-     * Reportedly not needed with 1.2.9, but we are still seeing some seed failures so re-introducing it.
-     * (This does not seem to help with the bug in 1.2.2.)
-     */
-    Duration DELAY_AFTER_FIRST = Duration.ONE_MINUTE;
-
-    /**
-     * If set (ie non-null), this waits the indicated time after a successful launch of one node
-     * before starting the next.  (If it is null, all nodes start simultaneously,
-     * possibly after the DELAY_AFTER_FIRST.)
-     * <p>
-     * When subsequent nodes start simultaneously, we occasionally see schema disagreement problems;
-     * if nodes start sequentially, we occasionally get "no sources for (tokenRange]" problems.
-     * Either way the node stops. Ideally this can be solved at the Cassandra level,
-     * but if not, we will have to introduce some restarts at the Cassandra nodes (which does seem
-     * to resolve the problems.)
-     */
-    Duration DELAY_BETWEEN_STARTS = null;
-    
-    /**
-     * Whether to wait for the first node to start up
-     * <p>
-     * not sure whether this is needed or not. Need to test in env where not all nodes are seed nodes,
-     * what happens if non-seed nodes start before the seed nodes?
-     */
-    boolean WAIT_FOR_FIRST = true;
-
-    @Effector(description="Updates the cluster members")
-    void update();
-
-    /**
-     * The name of the cluster.
-     */
-    String getClusterName();
-
-    Set<Entity> gatherPotentialSeeds();
-
-    Set<Entity> gatherPotentialRunningSeeds();
-
-    String executeScript(String commands);
-
-}