Rename o.a.b.sensor.core to o.a.b.core.sensor
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/722b87c2 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/722b87c2 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/722b87c2 Branch: refs/heads/0.8.0-incubating Commit: 722b87c28e9bd9ddd8d7d1bc3f32614f457a8269 Parents: fbe118c Author: Aled Sage <[email protected]> Authored: Wed Aug 19 22:42:32 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Wed Aug 19 22:48:55 2015 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/demo/GlobalWebFabricExample.java | 2 +- .../java/org/apache/brooklyn/demo/CumulusRDFApplication.java | 2 +- .../java/org/apache/brooklyn/demo/NodeJsTodoApplication.java | 4 ++-- .../org/apache/brooklyn/demo/WebClusterDatabaseExample.java | 6 +++--- .../apache/brooklyn/demo/WebClusterDatabaseExampleApp.java | 6 +++--- .../brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy | 4 ++-- .../apache/brooklyn/entity/database/derby/DerbyDatabase.java | 4 ++-- .../apache/brooklyn/entity/database/derby/DerbySchema.java | 2 +- .../entity/database/postgresql/PostgreSqlNodeSaltImpl.java | 2 +- .../java/org/apache/brooklyn/entity/salt/SaltConfig.java | 2 +- .../org/apache/brooklyn/entity/salt/SaltStackMaster.java | 4 ++-- .../brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java | 4 ++-- .../brooklyn/entity/monitoring/zabbix/ZabbixServer.java | 2 +- .../brooklyn/entity/nosql/hazelcast/HazelcastCluster.java | 4 ++-- .../brooklyn/entity/nosql/hazelcast/HazelcastNode.java | 6 +++--- .../brooklyn/entity/nosql/infinispan/Infinispan5Server.java | 4 ++-- .../org/apache/brooklyn/entity/database/DatastoreMixins.java | 2 +- .../org/apache/brooklyn/entity/database/crate/CrateNode.java | 8 ++++---- .../apache/brooklyn/entity/database/mariadb/MariaDbNode.java | 8 ++++---- .../apache/brooklyn/entity/database/mysql/MySqlCluster.java | 4 ++-- .../brooklyn/entity/database/mysql/MySqlClusterImpl.java | 4 ++-- .../org/apache/brooklyn/entity/database/mysql/MySqlNode.java | 8 ++++---- .../brooklyn/entity/database/postgresql/PostgreSqlNode.java | 4 ++-- .../entity/database/postgresql/PostgreSqlSshDriver.java | 2 +- .../apache/brooklyn/entity/database/rubyrep/RubyRepNode.java | 6 +++--- .../brooklyn/entity/database/rubyrep/RubyRepNodeImpl.java | 2 +- .../org/apache/brooklyn/entity/messaging/MessageBroker.java | 2 +- .../java/org/apache/brooklyn/entity/messaging/Queue.java | 4 ++-- .../java/org/apache/brooklyn/entity/messaging/Topic.java | 2 +- .../brooklyn/entity/messaging/activemq/ActiveMQBroker.java | 8 ++++---- .../apache/brooklyn/entity/messaging/amqp/AmqpExchange.java | 2 +- .../apache/brooklyn/entity/messaging/amqp/AmqpServer.java | 4 ++-- .../org/apache/brooklyn/entity/messaging/kafka/Kafka.java | 2 +- .../apache/brooklyn/entity/messaging/kafka/KafkaBroker.java | 4 ++-- .../apache/brooklyn/entity/messaging/kafka/KafkaCluster.java | 4 ++-- .../brooklyn/entity/messaging/kafka/KafkaZooKeeper.java | 2 +- .../apache/brooklyn/entity/messaging/qpid/QpidBroker.java | 4 ++-- .../brooklyn/entity/messaging/rabbit/RabbitBroker.java | 6 +++--- .../org/apache/brooklyn/entity/messaging/storm/Storm.java | 6 +++--- .../brooklyn/entity/messaging/storm/StormSshDriver.java | 2 +- .../apache/brooklyn/entity/zookeeper/ZooKeeperEnsemble.java | 4 ++-- .../org/apache/brooklyn/entity/zookeeper/ZooKeeperNode.java | 6 +++--- .../entity/messaging/storm/StormAbstractCloudLiveTest.java | 2 +- .../apache/brooklyn/entity/monitoring/monit/MonitNode.java | 6 +++--- .../entity/monitoring/monit/MonitIntegrationTest.java | 2 +- .../apache/brooklyn/entity/network/bind/BindDnsServer.java | 4 ++-- .../brooklyn/entity/network/bind/PrefixAndIdEnricher.java | 2 +- .../brooklyn/entity/nosql/cassandra/CassandraDatacenter.java | 4 ++-- .../brooklyn/entity/nosql/cassandra/CassandraNode.java | 6 +++--- .../brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java | 4 ++-- .../entity/nosql/cassandra/CassandraNodeSshDriver.java | 2 +- .../brooklyn/entity/nosql/couchbase/CouchbaseCluster.java | 2 +- .../entity/nosql/couchbase/CouchbaseClusterImpl.java | 2 +- .../brooklyn/entity/nosql/couchbase/CouchbaseNode.java | 6 +++--- .../entity/nosql/couchbase/CouchbaseNodeSshDriver.java | 2 +- .../entity/nosql/couchbase/CouchbaseSyncGateway.java | 6 +++--- .../nosql/couchbase/CouchbaseSyncGatewaySshDriver.java | 2 +- .../apache/brooklyn/entity/nosql/couchdb/CouchDBCluster.java | 4 ++-- .../apache/brooklyn/entity/nosql/couchdb/CouchDBNode.java | 2 +- .../entity/nosql/elasticsearch/ElasticSearchCluster.java | 2 +- .../entity/nosql/elasticsearch/ElasticSearchNode.java | 8 ++++---- .../brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java | 6 +++--- .../entity/nosql/mongodb/MongoDBClientSshDriver.java | 2 +- .../brooklyn/entity/nosql/mongodb/MongoDBReplicaSet.java | 2 +- .../apache/brooklyn/entity/nosql/mongodb/MongoDBServer.java | 4 ++-- .../nosql/mongodb/sharding/CoLocatedMongoDBRouter.java | 2 +- .../nosql/mongodb/sharding/CoLocatedMongoDBRouterImpl.java | 2 +- .../nosql/mongodb/sharding/MongoDBConfigServerCluster.java | 2 +- .../entity/nosql/mongodb/sharding/MongoDBRouter.java | 2 +- .../entity/nosql/mongodb/sharding/MongoDBRouterCluster.java | 2 +- .../nosql/mongodb/sharding/MongoDBShardedDeployment.java | 2 +- .../nosql/mongodb/sharding/MongoDBShardedDeploymentImpl.java | 2 +- .../apache/brooklyn/entity/nosql/redis/RedisClusterImpl.java | 2 +- .../org/apache/brooklyn/entity/nosql/redis/RedisStore.java | 6 +++--- .../org/apache/brooklyn/entity/nosql/riak/RiakCluster.java | 2 +- .../apache/brooklyn/entity/nosql/riak/RiakClusterImpl.java | 2 +- .../java/org/apache/brooklyn/entity/nosql/riak/RiakNode.java | 6 +++--- .../org/apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java | 2 +- .../org/apache/brooklyn/entity/nosql/solr/SolrServer.java | 4 ++-- .../entity/nosql/cassandra/CassandraNodeIntegrationTest.java | 2 +- .../apache/brooklyn/entity/osgi/karaf/KarafContainer.java | 6 +++--- .../apache/brooklyn/entity/dns/AbstractGeoDnsService.java | 2 +- .../brooklyn/entity/dns/geoscaling/GeoscalingDnsService.java | 2 +- .../org/apache/brooklyn/entity/proxy/AbstractController.java | 2 +- .../java/org/apache/brooklyn/entity/proxy/LoadBalancer.java | 6 +++--- .../apache/brooklyn/entity/proxy/nginx/NginxController.java | 4 ++-- .../org/apache/brooklyn/entity/proxy/nginx/UrlMapping.java | 2 +- .../entity/webapp/ControlledDynamicWebAppCluster.java | 4 ++-- .../apache/brooklyn/entity/webapp/DynamicWebAppCluster.java | 2 +- .../apache/brooklyn/entity/webapp/DynamicWebAppFabric.java | 2 +- .../org/apache/brooklyn/entity/webapp/JavaWebAppService.java | 2 +- .../brooklyn/entity/webapp/WebAppServiceConstants.java | 6 +++--- .../apache/brooklyn/entity/webapp/WebAppServiceMetrics.java | 8 ++++---- .../apache/brooklyn/entity/webapp/jboss/JBoss6Server.java | 2 +- .../apache/brooklyn/entity/webapp/jboss/JBoss7Server.java | 8 ++++---- .../apache/brooklyn/entity/webapp/jetty/Jetty6Server.java | 4 ++-- .../apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.java | 2 +- .../apache/brooklyn/entity/webapp/tomcat/TomcatServer.java | 6 +++--- .../java/org/apache/brooklyn/entity/proxy/StubAppServer.java | 2 +- .../entity/proxy/nginx/NginxHttpsSslIntegrationTest.java | 2 +- .../camp/brooklyn/EnrichersSlightlySimplerYamlTest.java | 2 +- .../org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java | 4 ++-- .../brooklyn/qa/longevity/webcluster/WebClusterApp.java | 2 +- 103 files changed, 186 insertions(+), 186 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java ---------------------------------------------------------------------- diff --git a/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java b/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java index c83d1d0..99faf04 100644 --- a/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java +++ b/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java @@ -35,13 +35,13 @@ 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.core.location.PortRanges; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.dns.geoscaling.GeoscalingDnsService; import org.apache.brooklyn.entity.group.DynamicRegionsFabric; import org.apache.brooklyn.entity.proxy.AbstractController; import org.apache.brooklyn.entity.webapp.ElasticJavaWebAppService; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.launcher.BrooklynLauncher; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; 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/722b87c2/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 bc3671f..4c0b87e 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 @@ -47,6 +47,7 @@ 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.core.location.PortRanges; +import org.apache.brooklyn.core.sensor.DependentConfiguration; import org.apache.brooklyn.entity.java.UsesJava; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter; @@ -58,7 +59,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.core.DependentConfiguration; import org.apache.brooklyn.util.CommandLineUtil; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/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 5ce062a..086f390 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 @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.demo; -import static org.apache.brooklyn.sensor.core.DependentConfiguration.attributeWhenReady; +import static org.apache.brooklyn.core.sensor.DependentConfiguration.attributeWhenReady; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.EntitySpec; @@ -26,10 +26,10 @@ import org.apache.brooklyn.core.entity.AbstractApplication; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.core.entity.trait.Startable; +import org.apache.brooklyn.core.sensor.DependentConfiguration; import org.apache.brooklyn.entity.nosql.redis.RedisStore; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.nodejs.NodeJsWebAppService; -import org.apache.brooklyn.sensor.core.DependentConfiguration; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/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 da1074e..6c56b5f 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 @@ -18,9 +18,9 @@ */ package org.apache.brooklyn.demo; +import static org.apache.brooklyn.core.sensor.DependentConfiguration.attributeWhenReady; +import static org.apache.brooklyn.core.sensor.DependentConfiguration.formatString; import static org.apache.brooklyn.entity.java.JavaEntityMethods.javaSysProp; -import static org.apache.brooklyn.sensor.core.DependentConfiguration.attributeWhenReady; -import static org.apache.brooklyn.sensor.core.DependentConfiguration.formatString; import java.util.List; import java.util.concurrent.TimeUnit; @@ -34,6 +34,7 @@ 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.core.location.PortRanges; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.JavaWebAppService; @@ -42,7 +43,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.core.Sensors; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.CommandLineUtil; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/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 cff372c..ed8a987 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 @@ -18,8 +18,8 @@ */ package org.apache.brooklyn.demo; -import static org.apache.brooklyn.sensor.core.DependentConfiguration.attributeWhenReady; -import static org.apache.brooklyn.sensor.core.DependentConfiguration.formatString; +import static org.apache.brooklyn.core.sensor.DependentConfiguration.attributeWhenReady; +import static org.apache.brooklyn.core.sensor.DependentConfiguration.formatString; import java.util.List; import java.util.concurrent.TimeUnit; @@ -36,6 +36,7 @@ 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.core.location.PortRanges; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.JavaWebAppService; @@ -47,7 +48,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.core.Sensors; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.CommandLineUtil; import org.apache.brooklyn.util.core.BrooklynMavenArtifacts; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy index 8ec01e4..0f852c2 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy @@ -19,8 +19,8 @@ package org.apache.brooklyn.demo; import static org.apache.brooklyn.entity.java.JavaEntityMethods.javaSysProp -import static org.apache.brooklyn.sensor.core.DependentConfiguration.attributeWhenReady -import static org.apache.brooklyn.sensor.core.DependentConfiguration.formatString +import static org.apache.brooklyn.core.sensor.DependentConfiguration.attributeWhenReady +import static org.apache.brooklyn.core.sensor.DependentConfiguration.formatString import org.apache.brooklyn.api.entity.EntitySpec import org.apache.brooklyn.core.entity.AbstractApplication http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java ---------------------------------------------------------------------- diff --git a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java index e9e3b6a..ffa8bd6 100644 --- a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java +++ b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java @@ -32,13 +32,13 @@ import org.slf4j.LoggerFactory; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.entity.java.UsesJava; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.core.config.BasicConfigKey; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.feed.jmx.JmxHelper; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java ---------------------------------------------------------------------- diff --git a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java index 5b9c7eb..23cfb2c 100644 --- a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java +++ b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import javax.management.ObjectName; import org.apache.brooklyn.core.entity.AbstractEntity; +import org.apache.brooklyn.core.sensor.BasicAttributeSensor; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.entity.database.Schema; @@ -33,7 +34,6 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.api.sensor.AttributeSensor; -import org.apache.brooklyn.sensor.core.BasicAttributeSensor; import org.apache.brooklyn.sensor.feed.jmx.JmxAttributePollConfig; import org.apache.brooklyn.sensor.feed.jmx.JmxFeed; import org.apache.brooklyn.sensor.feed.jmx.JmxHelper; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java index ace9a62..0070b39 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java @@ -37,10 +37,10 @@ import org.apache.brooklyn.core.effector.EffectorBody; import org.apache.brooklyn.core.effector.Effectors; import org.apache.brooklyn.core.effector.ssh.SshEffectorTasks; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.sensor.DependentConfiguration; import org.apache.brooklyn.entity.stock.EffectorStartableImpl; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode; -import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.sensor.feed.ssh.SshFeed; import org.apache.brooklyn.sensor.feed.ssh.SshPollConfig; import org.apache.brooklyn.util.ssh.BashCommands; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfig.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfig.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfig.java index cebded8..c67eda0 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfig.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfig.java @@ -26,10 +26,10 @@ import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.sensor.core.BasicAttributeSensor; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.config.MapConfigKey; import org.apache.brooklyn.core.config.SetConfigKey; +import org.apache.brooklyn.core.sensor.BasicAttributeSensor; import com.google.common.annotations.Beta; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java index a90b836..5b4a085 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java @@ -29,9 +29,9 @@ import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.BrooklynConfigKeys; +import org.apache.brooklyn.core.sensor.BasicAttributeSensor; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.sensor.core.BasicAttributeSensor; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java index 12d7bac..deb8bf1 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java @@ -21,8 +21,8 @@ package org.apache.brooklyn.entity.monitoring.zabbix; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; -import org.apache.brooklyn.sensor.core.BasicAttributeSensor; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.BasicAttributeSensor; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; public interface ZabbixMonitored { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java index 861d103..9ecaada 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java @@ -23,7 +23,7 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; -import org.apache.brooklyn.sensor.core.BasicAttributeSensor; +import org.apache.brooklyn.core.sensor.BasicAttributeSensor; import org.apache.brooklyn.util.core.flags.SetFromFlag; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java index d64cd3c..c43e882 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java @@ -29,9 +29,9 @@ import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.group.DynamicCluster; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.Sensors; /** * A cluster of {@link HazelcastNode}s based on {@link DynamicCluster}. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java index 54bce7e..e53d0da 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java @@ -24,12 +24,12 @@ import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.location.PortRanges; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.java.UsesJava; import org.apache.brooklyn.entity.java.UsesJmx; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.util.javalang.JavaClassNames; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5Server.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5Server.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5Server.java index 7d62229..7ec7bb4 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5Server.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5Server.java @@ -27,11 +27,11 @@ import org.slf4j.LoggerFactory; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.entity.java.UsesJmx; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.util.collections.MutableMap; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java index c2acfab..534c0eb 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java @@ -28,7 +28,7 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.effector.Effectors; -import org.apache.brooklyn.sensor.core.Sensors; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.util.core.ResourceUtils; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.stream.KnownSizeInputStream; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java index cdcbefb..f22381a 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java @@ -24,15 +24,15 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.location.PortRanges; +import org.apache.brooklyn.core.sensor.AttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.java.UsesJava; import org.apache.brooklyn.entity.java.UsesJavaMXBeans; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.sensor.core.AttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; @ImplementedBy(CrateNodeImpl.class) http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNode.java index 4063aef..3c78d99 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNode.java @@ -27,13 +27,13 @@ import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.config.MapConfigKey; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.location.PortRanges; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.Sensors; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.database.DatabaseNode; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.Sensors; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; @Catalog(name="MariaDB Node", description="MariaDB is an open source relational database management system (RDBMS)", iconUrl="classpath:///mariadb-logo-180x119.png") http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java index 955bde6..d860d04 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java @@ -25,13 +25,13 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.sensor.Sensors; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import com.google.common.reflect.TypeToken; import org.apache.brooklyn.entity.database.DatastoreMixins.HasDatastoreUrl; import org.apache.brooklyn.entity.group.DynamicCluster; -import org.apache.brooklyn.sensor.core.Sensors; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; @ImplementedBy(MySqlClusterImpl.class) @Catalog(name="MySql Master-Slave cluster", description="Sets up a cluster of MySQL nodes using master-slave relation and binary logging", iconUrl="classpath:///mysql-logo-110x57.png") http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/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 2d28ac7..e106728 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 @@ -36,9 +36,9 @@ import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.EntityInternal; 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.entity.group.DynamicClusterImpl; -import org.apache.brooklyn.sensor.core.DependentConfiguration; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.sensor.feed.function.FunctionFeed; import org.apache.brooklyn.sensor.feed.function.FunctionPollConfig; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java index aa11eb4..484606e 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java @@ -30,12 +30,12 @@ import org.apache.brooklyn.core.config.MapConfigKey; import org.apache.brooklyn.core.effector.MethodEffector; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.location.PortRanges; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.Sensors; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.Sensors; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; @Catalog(name="MySql Node", description="MySql is an open source relational database management system (RDBMS)", iconUrl="classpath:///mysql-logo-110x57.png") http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java index 6cb9cde..cd97719 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java @@ -26,12 +26,12 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.effector.Effectors; import org.apache.brooklyn.core.location.PortRanges; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.database.DatabaseNode; import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java index f9e80f7..5ff70fe 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java @@ -41,8 +41,8 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.core.effector.ssh.SshEffectorTasks; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.location.ssh.SshMachineLocation; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNode.java index 608b45d..e6580bb 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNode.java @@ -24,12 +24,12 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.Sensors; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.Sensors; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; @Catalog(name = "RubyRep Node", description = "RubyRep is a database replication system", iconUrl = "classpath:///rubyrep-logo.jpeg") http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNodeImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNodeImpl.java index 8340794..429c7aa 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNodeImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNodeImpl.java @@ -21,9 +21,9 @@ package org.apache.brooklyn.entity.database.rubyrep; import java.net.URI; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.sensor.DependentConfiguration; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; -import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.util.time.Duration; public class RubyRepNodeImpl extends SoftwareProcessImpl implements RubyRepNode { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/MessageBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/MessageBroker.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/MessageBroker.java index 5718aaf..23260d2 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/MessageBroker.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/MessageBroker.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.entity.messaging; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.sensor.AttributeSensor; -import org.apache.brooklyn.sensor.core.Sensors; +import org.apache.brooklyn.core.sensor.Sensors; /** * Marker interface identifying message brokers. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Queue.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Queue.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Queue.java index cfe2ab2..190d5bf 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Queue.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Queue.java @@ -19,8 +19,8 @@ package org.apache.brooklyn.entity.messaging; import org.apache.brooklyn.api.sensor.AttributeSensor; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.Sensors; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.Sensors; /** * An interface that describes a messaging queue. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Topic.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Topic.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Topic.java index f4d2539..c4ed3b7 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Topic.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Topic.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.messaging; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; /** * An interface that describes a messaging topic. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java index b52306e..aa79613 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java @@ -24,14 +24,14 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.sensor.AttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.messaging.MessageBroker; import org.apache.brooklyn.entity.messaging.jms.JMSBroker; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.sensor.core.AttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.time.Duration; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpExchange.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpExchange.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpExchange.java index a188a6e..0d3171c 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpExchange.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpExchange.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.entity.messaging.amqp; import org.apache.brooklyn.api.sensor.Sensor; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpServer.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpServer.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpServer.java index 80638f2..80b49ee 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpServer.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpServer.java @@ -20,8 +20,8 @@ package org.apache.brooklyn.entity.messaging.amqp; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.core.entity.Attributes; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; /** * Marker interface identifying AMQP servers. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java index 0d26997..6a2322c 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java @@ -21,8 +21,8 @@ package org.apache.brooklyn.entity.messaging.kafka; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java index c7d7829..1b54cdf 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java @@ -24,12 +24,12 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.location.PortRanges; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.messaging.MessageBroker; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaCluster.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaCluster.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaCluster.java index 4e48dc3..fba4e1c 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaCluster.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaCluster.java @@ -29,11 +29,11 @@ import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.BrooklynConfigKeys; import org.apache.brooklyn.core.entity.trait.Resizable; import org.apache.brooklyn.core.entity.trait.Startable; +import org.apache.brooklyn.core.sensor.BasicAttributeSensor; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.group.Cluster; import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; -import org.apache.brooklyn.sensor.core.BasicAttributeSensor; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java index 8de5a5f..5aee6d2 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java @@ -23,9 +23,9 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.annotation.Effector; import org.apache.brooklyn.core.annotation.EffectorParam; import org.apache.brooklyn.core.config.BasicConfigKey; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBroker.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBroker.java index 2d66ef5..89189f7 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBroker.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBroker.java @@ -26,13 +26,13 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.messaging.MessageBroker; import org.apache.brooklyn.entity.messaging.amqp.AmqpServer; import org.apache.brooklyn.entity.messaging.jms.JMSBroker; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitBroker.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitBroker.java index c4190cd..fc4eddf 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitBroker.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitBroker.java @@ -28,12 +28,12 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.messaging.MessageBroker; import org.apache.brooklyn.entity.messaging.amqp.AmqpServer; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/Storm.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/Storm.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/Storm.java index 827a23d..9b927cd 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/Storm.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/Storm.java @@ -25,12 +25,12 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.config.render.RendererHints; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormSshDriver.java index 8236e5b..66578e6 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormSshDriver.java @@ -28,13 +28,13 @@ import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.location.Machines; +import org.apache.brooklyn.core.sensor.DependentConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble; import org.apache.brooklyn.location.ssh.SshMachineLocation; -import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.net.Networking; import org.apache.brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperEnsemble.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperEnsemble.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperEnsemble.java index ad4d6a6..a5ba570 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperEnsemble.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperEnsemble.java @@ -25,9 +25,9 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.group.DynamicCluster; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperNode.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperNode.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperNode.java index 2de34f9..18cb6c6 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperNode.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperNode.java @@ -23,10 +23,10 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.sensor.BasicAttributeSensor; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.sensor.core.BasicAttributeSensor; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java index ef67a65..5633f74 100644 --- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java +++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java @@ -18,12 +18,12 @@ */ package org.apache.brooklyn.entity.messaging.storm; +import static org.apache.brooklyn.core.sensor.DependentConfiguration.attributeWhenReady; import static org.apache.brooklyn.entity.messaging.storm.Storm.NIMBUS_HOSTNAME; import static org.apache.brooklyn.entity.messaging.storm.Storm.ZOOKEEPER_ENSEMBLE; import static org.apache.brooklyn.entity.messaging.storm.Storm.Role.NIMBUS; import static org.apache.brooklyn.entity.messaging.storm.Storm.Role.SUPERVISOR; import static org.apache.brooklyn.entity.messaging.storm.Storm.Role.UI; -import static org.apache.brooklyn.sensor.core.DependentConfiguration.attributeWhenReady; import java.io.File; import java.util.Map; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNode.java ---------------------------------------------------------------------- diff --git a/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNode.java b/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNode.java index fa61039..2e3798c 100644 --- a/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNode.java +++ b/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNode.java @@ -27,10 +27,10 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.Sensors; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.Sensors; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/monitoring/src/test/java/org/apache/brooklyn/entity/monitoring/monit/MonitIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/monitoring/src/test/java/org/apache/brooklyn/entity/monitoring/monit/MonitIntegrationTest.java b/software/monitoring/src/test/java/org/apache/brooklyn/entity/monitoring/monit/MonitIntegrationTest.java index 2a26c6c..685f662 100644 --- a/software/monitoring/src/test/java/org/apache/brooklyn/entity/monitoring/monit/MonitIntegrationTest.java +++ b/software/monitoring/src/test/java/org/apache/brooklyn/entity/monitoring/monit/MonitIntegrationTest.java @@ -30,12 +30,12 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.MachineDetails; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.sensor.DependentConfiguration; import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport; import org.apache.brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.entity.software.base.SameServerEntity; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; -import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServer.java ---------------------------------------------------------------------- diff --git a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServer.java b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServer.java index 96c56fb..f5b5e21 100644 --- a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServer.java +++ b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServer.java @@ -33,10 +33,10 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.annotation.Effector; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.location.PortRanges; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.group.DynamicGroup; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.net.Cidr; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/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 6a90e83..c32e2ce 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,7 +24,7 @@ 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.sensor.core.Sensors; +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/722b87c2/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java index 2f92c47..d9d2bbf 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java @@ -31,11 +31,11 @@ import org.apache.brooklyn.core.annotation.Effector; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.effector.Effectors; import org.apache.brooklyn.core.effector.MethodEffector; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.nosql.cassandra.TokenGenerators.PosNeg63TokenGenerator; import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.group.DynamicCluster; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java index b945bdd..d5c7e2f 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java @@ -31,13 +31,13 @@ import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.BrooklynConfigKeys; import org.apache.brooklyn.core.location.PortRanges; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.java.UsesJavaMXBeans; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java index 0a7e638..d549776 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java @@ -41,14 +41,14 @@ import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.location.Machines; import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; +import org.apache.brooklyn.core.sensor.DependentConfiguration; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.java.JavaAppUtils; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.policy.enricher.RollingTimeWindowMeanEnricher; import org.apache.brooklyn.policy.enricher.TimeWeightedDeltaEnricher; -import org.apache.brooklyn.sensor.core.DependentConfiguration; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.sensor.feed.function.FunctionFeed; import org.apache.brooklyn.sensor.feed.function.FunctionPollConfig; import org.apache.brooklyn.sensor.feed.jmx.JmxAttributePollConfig; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java index 11d919e..193b49f 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java @@ -36,6 +36,7 @@ import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.location.Machines; import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; +import org.apache.brooklyn.core.sensor.DependentConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +48,6 @@ import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.location.ssh.SshMachineLocation; -import org.apache.brooklyn.sensor.core.DependentConfiguration; 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/722b87c2/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseCluster.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseCluster.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseCluster.java index 2ba961f..dfff6a4 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseCluster.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseCluster.java @@ -28,8 +28,8 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.group.DynamicCluster; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/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 bef9fa5..c065897 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 @@ -41,12 +41,12 @@ import org.apache.brooklyn.core.entity.EntityInternal; 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.entity.group.AbstractMembershipTrackingPolicy; import org.apache.brooklyn.entity.group.DynamicClusterImpl; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.sensor.feed.http.HttpFeed; import org.apache.brooklyn.sensor.feed.http.HttpPollConfig; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java index b592af8..8bde2f3 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java @@ -31,10 +31,10 @@ import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.core.effector.Effectors; import org.apache.brooklyn.core.effector.MethodEffector; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.text.ByteSizeStrings; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java index a5a821e..5da3c47 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java @@ -40,10 +40,10 @@ import org.apache.brooklyn.core.entity.drivers.downloads.BasicDownloadRequiremen import org.apache.brooklyn.core.entity.drivers.downloads.DownloadProducerFromUrlAttribute; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; +import org.apache.brooklyn.core.sensor.DependentConfiguration; import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.brooklyn.location.ssh.SshMachineLocation; -import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.sensor.feed.http.HttpValueFunctions; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.http.HttpTool; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/722b87c2/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGateway.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGateway.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGateway.java index 9d7d000..9576549 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGateway.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGateway.java @@ -23,10 +23,10 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; @ImplementedBy(CouchbaseSyncGatewayImpl.class)
