Repository: incubator-brooklyn Updated Branches: refs/heads/master 08662a7ca -> 56e8c3989
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/usage/launcher/src/test/resources/couchbase-replication-w-pillowfight.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/couchbase-replication-w-pillowfight.yaml b/usage/launcher/src/test/resources/couchbase-replication-w-pillowfight.yaml index 252d58c..6c5a95a 100644 --- a/usage/launcher/src/test/resources/couchbase-replication-w-pillowfight.yaml +++ b/usage/launcher/src/test/resources/couchbase-replication-w-pillowfight.yaml @@ -19,7 +19,7 @@ name: Couchbase w Replicating Cluster and Pillow Fight services: -- type: brooklyn.entity.nosql.couchbase.CouchbaseCluster +- type: org.apache.brooklyn.entity.nosql.couchbase.CouchbaseCluster id: couchbase name: Couchbase Primary Cluster adminUsername: Administrator @@ -36,7 +36,7 @@ services: location: aws-ec2:us-west-1 -- type: brooklyn.entity.nosql.couchbase.CouchbaseCluster +- type: org.apache.brooklyn.entity.nosql.couchbase.CouchbaseCluster id: couchbase-backup name: Couchbase Backup Cluster adminUsername: Administrator @@ -49,7 +49,7 @@ services: location: softlayer:ams01 -- type: "classpath://brooklyn/entity/nosql/couchbase/pillowfight.yaml" +- type: "classpath://org/apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml" brooklyn.config: base_url: $brooklyn:entity("couchbase").attributeWhenReady("couchbase.cluster.connection.url") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/usage/launcher/src/test/resources/couchbase-w-loadgen.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/couchbase-w-loadgen.yaml b/usage/launcher/src/test/resources/couchbase-w-loadgen.yaml index 101511e..b3e1bce 100644 --- a/usage/launcher/src/test/resources/couchbase-w-loadgen.yaml +++ b/usage/launcher/src/test/resources/couchbase-w-loadgen.yaml @@ -22,7 +22,7 @@ location: softlayer:wdc01 services: -- type: brooklyn.entity.nosql.couchbase.CouchbaseCluster +- type: org.apache.brooklyn.entity.nosql.couchbase.CouchbaseCluster id: cb-cluster adminUsername: Administrator adminPassword: Password @@ -35,7 +35,7 @@ services: brooklyn.policies: - type: brooklyn.policy.autoscaling.AutoScalerPolicy brooklyn.config: - metric: $brooklyn:sensor("brooklyn.entity.nosql.couchbase.CouchbaseCluster", + metric: $brooklyn:sensor("org.apache.brooklyn.entity.nosql.couchbase.CouchbaseCluster", "couchbase.stats.cluster.per.node.ops") metricLowerBound: 500 metricUpperBound: 1000 http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/usage/launcher/src/test/resources/couchbase-w-pillowfight.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/couchbase-w-pillowfight.yaml b/usage/launcher/src/test/resources/couchbase-w-pillowfight.yaml index 2ee46ee..8ac5e03 100644 --- a/usage/launcher/src/test/resources/couchbase-w-pillowfight.yaml +++ b/usage/launcher/src/test/resources/couchbase-w-pillowfight.yaml @@ -21,7 +21,7 @@ name: Couchbase w Pillow Fight location: softlayer:wdc01 services: -- type: brooklyn.entity.nosql.couchbase.CouchbaseCluster +- type: org.apache.brooklyn.entity.nosql.couchbase.CouchbaseCluster id: couchbase adminUsername: Administrator adminPassword: Password @@ -30,6 +30,6 @@ services: - bucket: default bucket-port: 11211 -- type: "classpath://brooklyn/entity/nosql/couchbase/pillowfight.yaml" +- type: "classpath://org/apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml" brooklyn.config: base_url: $brooklyn:entity("couchbase").attributeWhenReady("couchbase.cluster.connection.url") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/usage/launcher/src/test/resources/mongo-blueprint.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/mongo-blueprint.yaml b/usage/launcher/src/test/resources/mongo-blueprint.yaml index c63b8db..32fe22a 100644 --- a/usage/launcher/src/test/resources/mongo-blueprint.yaml +++ b/usage/launcher/src/test/resources/mongo-blueprint.yaml @@ -19,5 +19,5 @@ name: Mongo3 location: localhost services: -- type: brooklyn.entity.nosql.mongodb.MongoDBReplicaSet +- type: org.apache.brooklyn.entity.nosql.mongodb.MongoDBReplicaSet name: MongoDB Replica Set http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/usage/launcher/src/test/resources/mongo-client-single-server.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/mongo-client-single-server.yaml b/usage/launcher/src/test/resources/mongo-client-single-server.yaml index 353baff..4732b9a 100644 --- a/usage/launcher/src/test/resources/mongo-client-single-server.yaml +++ b/usage/launcher/src/test/resources/mongo-client-single-server.yaml @@ -19,10 +19,10 @@ name: Mongo Single Server with Scripts location: localhost services: -- serviceType: brooklyn.entity.nosql.mongodb.MongoDBServer +- serviceType: org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer id: mySingleServer name: mongod -- serviceType: brooklyn.entity.nosql.mongodb.MongoDBClient +- serviceType: org.apache.brooklyn.entity.nosql.mongodb.MongoDBClient name: MongoDB Javascript Client brooklyn.config: server: $brooklyn:component("mySingleServer") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/usage/launcher/src/test/resources/mongo-scripts.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/mongo-scripts.yaml b/usage/launcher/src/test/resources/mongo-scripts.yaml index 0115d71..17362e5 100644 --- a/usage/launcher/src/test/resources/mongo-scripts.yaml +++ b/usage/launcher/src/test/resources/mongo-scripts.yaml @@ -21,12 +21,12 @@ description: MongoDB sharded deployment with MongoDB (javascript) client origin: https://github.com/apache/incubator-brooklyn location: localhost services: -- serviceType: brooklyn.entity.nosql.mongodb.sharding.MongoDBShardedDeployment +- serviceType: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBShardedDeployment id: shardeddeployment name: MongoDB Sharded Deployment brooklyn.config: initialRouterClusterSize: 1 -- serviceType: brooklyn.entity.nosql.mongodb.MongoDBClient +- serviceType: org.apache.brooklyn.entity.nosql.mongodb.MongoDBClient name: MongoDB Javascript Client brooklyn.config: shardedDeployment: $brooklyn:component("shardeddeployment") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/usage/launcher/src/test/resources/mongo-sharded.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/mongo-sharded.yaml b/usage/launcher/src/test/resources/mongo-sharded.yaml index dcf1f2b..8d27c19 100644 --- a/usage/launcher/src/test/resources/mongo-sharded.yaml +++ b/usage/launcher/src/test/resources/mongo-sharded.yaml @@ -20,7 +20,7 @@ name: Sharded MongoDB With Web App description: Auto-scaling web app backed by MongoDB location: my-docker-cloud services: -- type: brooklyn.entity.nosql.mongodb.sharding.MongoDBShardedDeployment +- type: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBShardedDeployment id: mongo name: Mongo DB Backend brooklyn.config: @@ -34,7 +34,7 @@ services: brooklyn.config: memberSpec: $brooklyn:entitySpec: - type: brooklyn.entity.nosql.mongodb.sharding.CoLocatedMongoDBRouter + type: org.apache.brooklyn.entity.nosql.mongodb.sharding.CoLocatedMongoDBRouter brooklyn.enrichers: - type: brooklyn.enricher.basic.Propagator brooklyn.config: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/usage/launcher/src/test/resources/mongo-single-server-blueprint.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/mongo-single-server-blueprint.yaml b/usage/launcher/src/test/resources/mongo-single-server-blueprint.yaml index 73615d0..1c87dd5 100644 --- a/usage/launcher/src/test/resources/mongo-single-server-blueprint.yaml +++ b/usage/launcher/src/test/resources/mongo-single-server-blueprint.yaml @@ -18,6 +18,6 @@ # name: Mongo1 services: -- serviceType: brooklyn.entity.nosql.mongodb.MongoDBServer +- serviceType: org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer name: MongoDB Single Server location: localhost http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/usage/launcher/src/test/resources/playing.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/playing.yaml b/usage/launcher/src/test/resources/playing.yaml index 6182f38..d02bb76 100644 --- a/usage/launcher/src/test/resources/playing.yaml +++ b/usage/launcher/src/test/resources/playing.yaml @@ -18,4 +18,4 @@ # name: cassandra node services: -- type: brooklyn.entity.nosql.cassandra.CassandraNode +- type: org.apache.brooklyn.entity.nosql.cassandra.CassandraNode http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java b/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java index 02c19bb..2c0d8fb 100644 --- a/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java +++ b/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java @@ -62,10 +62,10 @@ public class ApplicationResourceIntegrationTest { private static final Duration LONG_WAIT = Duration.minutes(10); - private final String redisSpec = "{\"name\": \"redis-app\", \"type\": \"brooklyn.entity.nosql.redis.RedisStore\", \"locations\": [ \"localhost\"]}"; + private final String redisSpec = "{\"name\": \"redis-app\", \"type\": \"org.apache.brooklyn.entity.nosql.redis.RedisStore\", \"locations\": [ \"localhost\"]}"; private final ApplicationSpec legacyRedisSpec = ApplicationSpec.builder().name("redis-legacy-app") - .entities(ImmutableSet.of(new EntitySpec("redis-ent", "brooklyn.entity.nosql.redis.RedisStore"))) + .entities(ImmutableSet.of(new EntitySpec("redis-ent", "org.apache.brooklyn.entity.nosql.redis.RedisStore"))) .locations(ImmutableSet.of("localhost")) .build(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/usage/rest-server/src/test/java/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java b/usage/rest-server/src/test/java/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java index 0eda001..2ee4f25 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java @@ -55,7 +55,7 @@ public class ApplicationResourceIntegrationTest extends BrooklynRestResourceTest private static final Logger log = LoggerFactory.getLogger(ApplicationResourceIntegrationTest.class); private final ApplicationSpec redisSpec = ApplicationSpec.builder().name("redis-app") - .entities(ImmutableSet.of(new EntitySpec("redis-ent", "brooklyn.entity.nosql.redis.RedisStore"))) + .entities(ImmutableSet.of(new EntitySpec("redis-ent", "org.apache.brooklyn.entity.nosql.redis.RedisStore"))) .locations(ImmutableSet.of("localhost")) .build(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5cf5285/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java b/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java index 8350b48..eb3d2ea 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java @@ -202,7 +202,7 @@ public class CatalogResourceTest extends BrooklynRestResourceTest { // not of the entity itself, so the test won't make sense any more. public void testGetCatalogEntityDetails() { CatalogEntitySummary details = client() - .resource(URI.create("/v1/catalog/entities/brooklyn.entity.nosql.redis.RedisStore")) + .resource(URI.create("/v1/catalog/entities/org.apache.brooklyn.entity.nosql.redis.RedisStore")) .get(CatalogEntitySummary.class); assertTrue(details.toString().contains("redis.port"), "expected more config, only got: "+details); String iconUrl = "/v1/catalog/icon/" + details.getSymbolicName(); @@ -215,7 +215,7 @@ public class CatalogResourceTest extends BrooklynRestResourceTest { // not of the entity itself, so the test won't make sense any more. public void testGetCatalogEntityPlusVersionDetails() { CatalogEntitySummary details = client() - .resource(URI.create("/v1/catalog/entities/brooklyn.entity.nosql.redis.RedisStore:0.0.0.SNAPSHOT")) + .resource(URI.create("/v1/catalog/entities/org.apache.brooklyn.entity.nosql.redis.RedisStore:0.0.0.SNAPSHOT")) .get(CatalogEntitySummary.class); assertTrue(details.toString().contains("redis.port"), "expected more config, only got: "+details); String expectedIconUrl = "/v1/catalog/icon/" + details.getSymbolicName() + "/" + details.getVersion(); @@ -236,7 +236,7 @@ public class CatalogResourceTest extends BrooklynRestResourceTest { } private void addTestCatalogItemRedisAsEntity(String catalogItemId) { - addTestCatalogItem(catalogItemId, null, TEST_VERSION, "brooklyn.entity.nosql.redis.RedisStore"); + addTestCatalogItem(catalogItemId, null, TEST_VERSION, "org.apache.brooklyn.entity.nosql.redis.RedisStore"); } private void addTestCatalogItem(String catalogItemId, String itemType, String version, String service) {
