Skip to content
Permalink
Browse files
[BROOKLYN-162] Renaming of the NoSQL packages
- From brooklyn.entity.nosql to org.apache.brooklyn.entity.nosql
  • Loading branch information
ygy committed Aug 6, 2015
1 parent 08662a7 commit d5cf5285286a6397d8f7abef32c00e2179259b38
Showing 192 changed files with 371 additions and 285 deletions.
@@ -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))
@@ -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
@@ -27,6 +27,10 @@

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.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 void initApp() {
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)
@@ -22,13 +22,14 @@

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;
@@ -24,15 +24,16 @@
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;
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;
@@ -22,13 +22,14 @@

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;
@@ -20,10 +20,11 @@

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;
@@ -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. */
@@ -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 {
@@ -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. */
@@ -23,14 +23,15 @@

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 void initApp() {
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))
@@ -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:
@@ -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
@@ -24,15 +24,15 @@ locations:
- rackspace-cloudservers-uk

services:
- type: brooklyn.entity.nosql.cassandra.CassandraFabric