Rename o.a.b.sensor.enricher to o.a.b.core.enricher - and o.a.b.enricher.stock for actual enricher impls
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/a19506ca Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/a19506ca Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/a19506ca Branch: refs/heads/0.8.0-incubating Commit: a19506ca0b66665ff54e553f70e2d67377f570d2 Parents: 970969b Author: Aled Sage <[email protected]> Authored: Wed Aug 19 23:07:28 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Wed Aug 19 23:07:28 2015 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/demo/ResilientMongoDbApp.java | 2 +- .../apache/brooklyn/demo/WebClusterDatabaseExample.java | 2 +- .../brooklyn/demo/WebClusterDatabaseExampleApp.java | 2 +- ...bindWebClusterDatabaseExampleAppIntegrationTest.java | 2 +- .../brooklyn/entity/database/crate/CrateNodeImpl.java | 2 +- .../entity/database/mysql/MySqlClusterImpl.java | 2 +- .../entity/messaging/kafka/KafkaClusterImpl.java | 2 +- .../entity/messaging/storm/StormDeploymentImpl.java | 2 +- .../network/bind/BindDnsServerIntegrationTest.java | 2 +- .../entity/network/bind/PrefixAndIdEnricher.java | 2 +- .../entity/nosql/cassandra/CassandraDatacenterImpl.java | 2 +- .../entity/nosql/couchbase/CouchbaseClusterImpl.java | 2 +- .../entity/nosql/mongodb/MongoDBReplicaSetImpl.java | 2 +- .../mongodb/sharding/CoLocatedMongoDBRouterImpl.java | 2 +- .../mongodb/sharding/MongoDBShardedDeploymentImpl.java | 2 +- .../brooklyn/entity/nosql/redis/RedisClusterImpl.java | 2 +- .../brooklyn/entity/nosql/riak/RiakClusterImpl.java | 2 +- .../apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java | 2 +- .../entity/proxy/nginx/NginxControllerImpl.java | 2 +- .../webapp/ControlledDynamicWebAppClusterImpl.java | 2 +- .../entity/webapp/DynamicWebAppClusterImpl.java | 2 +- .../brooklyn/entity/webapp/DynamicWebAppFabricImpl.java | 2 +- .../brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java | 2 +- .../brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java | 2 +- .../brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java | 2 +- .../test-app-with-enrichers-slightly-simpler.yaml | 12 ++++++------ .../resources/test-webapp-with-averaging-enricher.yaml | 4 ++-- .../brooklyn/qa/load/SimulatedJBoss7ServerImpl.java | 2 +- .../apache/brooklyn/qa/load/SimulatedTheeTierApp.java | 2 +- .../longevity/webcluster/SinusoidalLoadGenerator.java | 2 +- .../brooklyn/qa/longevity/webcluster/WebClusterApp.java | 2 +- 31 files changed, 37 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/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 24622c0..6b43e7d 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 @@ -30,6 +30,7 @@ import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.entity.AbstractApplication; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.StartableApplication; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBReplicaSet; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer; @@ -38,7 +39,6 @@ import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.policy.ha.ServiceFailureDetector; import org.apache.brooklyn.policy.ha.ServiceReplacer; import org.apache.brooklyn.policy.ha.ServiceRestarter; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java index 6c56b5f..0d224bd 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java @@ -35,6 +35,7 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.core.sensor.Sensors; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.JavaWebAppService; @@ -43,7 +44,6 @@ import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; import org.apache.brooklyn.policy.enricher.HttpLatencyDetector; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java index ed8a987..b1d373b 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java @@ -37,6 +37,7 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.core.sensor.Sensors; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.JavaWebAppService; @@ -48,7 +49,6 @@ import org.apache.brooklyn.entity.java.JavaEntityMethods; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; import org.apache.brooklyn.policy.enricher.HttpLatencyDetector; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.CommandLineUtil; import org.apache.brooklyn.util.core.BrooklynMavenArtifacts; import org.apache.brooklyn.util.core.ResourceUtils; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java b/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java index 40fd821..128e6cf 100644 --- a/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java +++ b/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java @@ -26,11 +26,11 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.core.mgmt.rebind.RebindOptions; import org.apache.brooklyn.core.mgmt.rebind.RebindTestFixture; +import org.apache.brooklyn.enricher.stock.Propagator; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server; -import org.apache.brooklyn.sensor.enricher.Propagator; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java index f78ddba..40f0989 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java @@ -20,13 +20,13 @@ package org.apache.brooklyn.entity.database.crate; import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.java.JavaAppUtils; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.feed.http.HttpFeed; import org.apache.brooklyn.feed.http.HttpPollConfig; import org.apache.brooklyn.feed.http.HttpValueFunctions; import org.apache.brooklyn.feed.jmx.JmxFeed; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.guava.Functionals; public class CrateNodeImpl extends SoftwareProcessImpl implements CrateNode{ http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java index d6527ca..9a444fd 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java @@ -38,10 +38,10 @@ import org.apache.brooklyn.core.entity.EntityPredicates; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic; import org.apache.brooklyn.core.sensor.DependentConfiguration; import org.apache.brooklyn.core.sensor.Sensors; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.group.DynamicClusterImpl; import org.apache.brooklyn.feed.function.FunctionFeed; import org.apache.brooklyn.feed.function.FunctionPollConfig; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.collections.CollectionFunctionals; import org.apache.brooklyn.util.core.task.DynamicTasks; import org.apache.brooklyn.util.core.task.TaskBuilder; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java index ceb4422..3daa097 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java @@ -28,11 +28,11 @@ import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.core.feed.ConfigToAttributes; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.exceptions.CompoundRuntimeException; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormDeploymentImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormDeploymentImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormDeploymentImpl.java index e8faa7b..61d6a4e 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormDeploymentImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormDeploymentImpl.java @@ -25,12 +25,12 @@ import static org.apache.brooklyn.entity.messaging.storm.Storm.Role.UI; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.stock.BasicStartableImpl; import org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.core.ResourceUtils; public class StormDeploymentImpl extends BasicStartableImpl implements StormDeployment { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java index a87cc9c..2f68059 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java @@ -31,9 +31,9 @@ import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.core.mgmt.rebind.RebindOptions; import org.apache.brooklyn.core.mgmt.rebind.RebindTestFixture; import org.apache.brooklyn.core.test.entity.TestApplication; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.software.base.EmptySoftwareProcess; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java index c32e2ce..9c75ace 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java @@ -24,8 +24,8 @@ import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.enricher.AbstractEnricher; import org.apache.brooklyn.core.sensor.Sensors; -import org.apache.brooklyn.sensor.enricher.AbstractEnricher; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java index 13df45b..27f83aa 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java @@ -42,12 +42,12 @@ import org.apache.brooklyn.core.entity.EntityPredicates; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic; import org.apache.brooklyn.core.location.Machines; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; import org.apache.brooklyn.entity.group.DynamicClusterImpl; import org.apache.brooklyn.entity.group.DynamicGroup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java index 4bff736..3ae6fe9 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java @@ -42,6 +42,7 @@ import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; import org.apache.brooklyn.core.sensor.DependentConfiguration; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; import org.apache.brooklyn.entity.group.DynamicClusterImpl; import org.apache.brooklyn.entity.software.base.SoftwareProcess; @@ -51,7 +52,6 @@ import org.apache.brooklyn.feed.http.HttpValueFunctions; import org.apache.brooklyn.feed.http.JsonFunctions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.collections.CollectionFunctionals; import org.apache.brooklyn.util.collections.MutableSet; import org.apache.brooklyn.util.collections.QuorumCheck; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBReplicaSetImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBReplicaSetImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBReplicaSetImpl.java index 49a1201..399ea91 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBReplicaSetImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBReplicaSetImpl.java @@ -44,9 +44,9 @@ import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.core.entity.trait.Startable; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; import org.apache.brooklyn.entity.group.DynamicClusterImpl; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableSet; import org.apache.brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouterImpl.java index e27cb4b..7817dbc 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouterImpl.java @@ -25,8 +25,8 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.core.sensor.DependentConfiguration; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.software.base.SameServerEntityImpl; -import org.apache.brooklyn.sensor.enricher.Enrichers; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentImpl.java index cbebbec..9ef50b9 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentImpl.java @@ -35,9 +35,9 @@ import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic; import org.apache.brooklyn.core.entity.trait.Startable; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; import org.apache.brooklyn.entity.group.DynamicCluster; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisClusterImpl.java index 838def8..92c7593 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisClusterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisClusterImpl.java @@ -30,8 +30,8 @@ import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceProblemsLogic; import org.apache.brooklyn.core.sensor.Sensors; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.group.DynamicCluster; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.collections.QuorumCheck.QuorumChecks; import org.apache.brooklyn.util.exceptions.CompoundRuntimeException; import org.apache.brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakClusterImpl.java index d3a9b70..5002402 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakClusterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakClusterImpl.java @@ -39,9 +39,9 @@ import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic; import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.core.sensor.DependentConfiguration; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; import org.apache.brooklyn.entity.group.DynamicClusterImpl; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.core.task.Tasks; import org.apache.brooklyn.util.time.Duration; import org.apache.brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java index 85ac3e8..08773c8 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java @@ -33,12 +33,12 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; import org.apache.brooklyn.core.sensor.AttributeSensorAndConfigKey; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.entity.webapp.WebAppServiceMethods; import org.apache.brooklyn.feed.http.HttpFeed; import org.apache.brooklyn.feed.http.HttpPollConfig; import org.apache.brooklyn.feed.http.HttpValueFunctions; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.collections.MutableSet; import org.apache.brooklyn.util.core.config.ConfigBag; import org.apache.brooklyn.util.guava.Functionals; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java index 7952c91..eadde49 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java @@ -36,6 +36,7 @@ import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic; import org.apache.brooklyn.core.feed.ConfigToAttributes; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; import org.apache.brooklyn.entity.proxy.AbstractControllerImpl; import org.apache.brooklyn.entity.proxy.ProxySslConfig; @@ -43,7 +44,6 @@ import org.apache.brooklyn.entity.proxy.nginx.NginxController.NginxControllerInt import org.apache.brooklyn.feed.http.HttpFeed; import org.apache.brooklyn.feed.http.HttpPollConfig; import org.apache.brooklyn.feed.http.HttpValueFunctions; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.core.ResourceUtils; import org.apache.brooklyn.util.core.file.ArchiveUtils; import org.apache.brooklyn.util.core.http.HttpTool; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java index 7ff08a5..3785a47 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java @@ -38,11 +38,11 @@ import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.core.entity.trait.StartableMethods; import org.apache.brooklyn.core.feed.ConfigToAttributes; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.group.DynamicGroupImpl; import org.apache.brooklyn.entity.proxy.LoadBalancer; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.collections.QuorumCheck.QuorumChecks; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java index 10d21a1..4bc1fd3 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java @@ -33,9 +33,9 @@ import org.apache.brooklyn.core.effector.Effectors; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.EntityInternal; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.group.DynamicClusterImpl; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.collections.MutableSet; import org.apache.brooklyn.util.core.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppFabricImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppFabricImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppFabricImpl.java index 38bf6f6..2c9747d 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppFabricImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppFabricImpl.java @@ -23,8 +23,8 @@ import java.util.List; import javax.annotation.Nullable; import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.group.DynamicFabricImpl; -import org.apache.brooklyn.sensor.enricher.Enrichers; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java index 7c7173b..2d8bc54 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java @@ -24,10 +24,10 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcessImpl; import org.apache.brooklyn.feed.jmx.JmxAttributePollConfig; import org.apache.brooklyn.feed.jmx.JmxFeed; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java index f32d6a0..09f09c1 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java @@ -24,13 +24,13 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcessImpl; import org.apache.brooklyn.feed.http.HttpFeed; import org.apache.brooklyn.feed.http.HttpPollConfig; import org.apache.brooklyn.feed.http.HttpValueFunctions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.guava.Functionals; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java index d264c66..d8f2433 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java @@ -21,12 +21,12 @@ package org.apache.brooklyn.entity.webapp.jetty; import java.util.concurrent.TimeUnit; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.java.JavaAppUtils; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcessImpl; import org.apache.brooklyn.feed.jmx.JmxAttributePollConfig; import org.apache.brooklyn.feed.jmx.JmxFeed; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/usage/camp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml b/usage/camp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml index bc753a5..2b55237 100644 --- a/usage/camp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml +++ b/usage/camp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml @@ -29,14 +29,14 @@ services: $brooklyn:entitySpec: type: org.apache.brooklyn.core.test.entity.TestEntity brooklyn.enrichers: - - type: org.apache.brooklyn.sensor.enricher.Transformer + - type: org.apache.brooklyn.enricher.stock.Transformer # transform "ip" (which we expect a feed, not shown here, to set) to a URL; # you can curl an address string to the sensors/ip endpoint an entity to trigger these enrichers brooklyn.config: enricher.sourceSensor: $brooklyn:sensor("ip") enricher.targetSensor: $brooklyn:sensor("url") enricher.targetValue: $brooklyn:formatString("http://%s/";, $brooklyn:attributeWhenReady("ip")) - - type: org.apache.brooklyn.sensor.enricher.Propagator + - type: org.apache.brooklyn.enricher.stock.Propagator # use propagator to duplicate one sensor as another, giving the supplied sensor mapping; # the other use of Propagator is where you specify a producer (using $brooklyn:entity(...) as below) # from which to take sensors; in that mode you can specify `propagate` as a list of sensors whose names are unchanged, @@ -45,13 +45,13 @@ services: sensorMapping: $brooklyn:sensor("url"): $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri") brooklyn.enrichers: - - type: org.apache.brooklyn.sensor.enricher.Aggregator + - type: org.apache.brooklyn.enricher.stock.Aggregator # aggregate `url` sensors from children into a list brooklyn.config: enricher.sourceSensor: $brooklyn:sensor("url") enricher.targetSensor: $brooklyn:sensor("urls.list") enricher.aggregating.fromMembers: true - - type: org.apache.brooklyn.sensor.enricher.Joiner + - type: org.apache.brooklyn.enricher.stock.Joiner # create a string from that list, for use e.g. in bash scripts brooklyn.config: enricher.sourceSensor: $brooklyn:sensor("urls.list") @@ -59,7 +59,7 @@ services: maximum: 2 # TODO infer uniqueTag, name etc uniqueTag: urls.list.comma_separated.max_2 - - type: org.apache.brooklyn.sensor.enricher.Joiner + - type: org.apache.brooklyn.enricher.stock.Joiner # pick one uri as the main one to use brooklyn.config: enricher.sourceSensor: $brooklyn:sensor("urls.list") @@ -67,7 +67,7 @@ services: quote: false maximum: 1 brooklyn.enrichers: -- type: org.apache.brooklyn.sensor.enricher.Propagator +- type: org.apache.brooklyn.enricher.stock.Propagator # if nothing specified for `propagating` or `sensorMapping` then # Propagator will do all but the usual lifecycle defaults, handy at the root! brooklyn.config: http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/usage/camp/src/test/resources/test-webapp-with-averaging-enricher.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/test-webapp-with-averaging-enricher.yaml b/usage/camp/src/test/resources/test-webapp-with-averaging-enricher.yaml index 73b8eae..9a508cb 100644 --- a/usage/camp/src/test/resources/test-webapp-with-averaging-enricher.yaml +++ b/usage/camp/src/test/resources/test-webapp-with-averaging-enricher.yaml @@ -32,7 +32,7 @@ services: type: org.apache.brooklyn.entity.webapp.DynamicWebAppCluster id: cluster brooklyn.enrichers: - - type: org.apache.brooklyn.sensor.enricher.Aggregator + - type: org.apache.brooklyn.enricher.stock.Aggregator brooklyn.config: enricher.sourceSensor: $brooklyn:sensor("my.load") enricher.targetSensor: $brooklyn:sensor("my.load.averaged") @@ -40,7 +40,7 @@ services: transformation: average brooklyn.enrichers: - - type: org.apache.brooklyn.sensor.enricher.Propagator + - type: org.apache.brooklyn.enricher.stock.Propagator brooklyn.config: producer: $brooklyn:entity("cluster") propagating: http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java index 05f40ed..eb55d73 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java @@ -25,6 +25,7 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.webapp.jboss.JBoss7ServerImpl; import org.apache.brooklyn.entity.webapp.jboss.JBoss7SshDriver; import org.apache.brooklyn.feed.function.FunctionFeed; @@ -33,7 +34,6 @@ import org.apache.brooklyn.feed.http.HttpFeed; import org.apache.brooklyn.feed.http.HttpPollConfig; import org.apache.brooklyn.feed.http.HttpValueFunctions; import org.apache.brooklyn.location.ssh.SshMachineLocation; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.guava.Functionals; import org.apache.brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java index 3c191a1..80daba7 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java @@ -33,6 +33,7 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.core.location.PortRanges; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.java.JavaEntityMethods; @@ -46,7 +47,6 @@ import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; import org.apache.brooklyn.policy.enricher.HttpLatencyDetector; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.CommandLineUtil; import org.apache.brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java index 06b1cad..7559420 100644 --- a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java +++ b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java @@ -26,7 +26,7 @@ import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.sensor.enricher.AbstractEnricher; +import org.apache.brooklyn.core.enricher.AbstractEnricher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a19506ca/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java index f43cdcb..31f5060 100644 --- a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java +++ b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java @@ -28,12 +28,12 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.core.internal.BrooklynProperties; import org.apache.brooklyn.core.sensor.Sensors; +import org.apache.brooklyn.enricher.stock.Enrichers; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; -import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.collect.Lists;
