http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java index 3c9bb70..a08cd1d 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java @@ -24,6 +24,7 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.Callable; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; @@ -33,7 +34,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.entity.messaging.activemq.ActiveMQBroker; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; import brooklyn.location.LocationSpec;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaLiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaLiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaLiveTest.java index 9e07e4f..96183b8 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaLiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaLiveTest.java @@ -23,9 +23,10 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.Callable; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; + import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; import brooklyn.test.Asserts; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaSupport.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaSupport.java b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaSupport.java index e035784..179f76e 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaSupport.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaSupport.java @@ -18,7 +18,6 @@ */ package brooklyn.entity.messaging.kafka; -import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.zookeeper.ZooKeeperNode; @@ -26,6 +25,7 @@ import com.google.common.base.Optional; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; +import org.apache.brooklyn.api.entity.Entity; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidEc2LiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidEc2LiveTest.java index 45a3c60..c584148 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidEc2LiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidEc2LiveTest.java @@ -18,11 +18,11 @@ */ package brooklyn.entity.messaging.qpid; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java index c81505a..74c07c1 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java @@ -33,6 +33,7 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.entity.TestApplication; @@ -48,7 +49,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; import brooklyn.test.Asserts; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitEc2LiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitEc2LiveTest.java index 9929288..09820f1 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitEc2LiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitEc2LiveTest.java @@ -20,6 +20,7 @@ package brooklyn.entity.messaging.rabbit; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +30,6 @@ import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.messaging.MessageBroker; import brooklyn.entity.messaging.amqp.AmqpExchange; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import com.google.common.base.Charsets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java index 268b212..f358c1e 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertFalse; import java.io.IOException; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -35,7 +36,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.entity.messaging.MessageBroker; import brooklyn.entity.messaging.amqp.AmqpExchange; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java index 9c2d67f..536e482 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java @@ -28,6 +28,7 @@ import static brooklyn.event.basic.DependentConfiguration.attributeWhenReady; import java.io.File; import java.util.Map; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +48,6 @@ import brooklyn.entity.BrooklynAppLiveTestSupport; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.messaging.storm.topologies.ExclamationBolt; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.entity.zookeeper.ZooKeeperEnsemble; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormEc2LiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormEc2LiveTest.java index 7b55069..b587e00 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormEc2LiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormEc2LiveTest.java @@ -18,12 +18,12 @@ */ package brooklyn.entity.messaging.storm; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.entity.zookeeper.ZooKeeperNode; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEc2LiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEc2LiveTest.java index a8d21d1..1b08112 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEc2LiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEc2LiveTest.java @@ -18,12 +18,12 @@ */ package brooklyn.entity.messaging.zookeeper; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.entity.zookeeper.ZooKeeperNode; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java index dda2843..a2ad585 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java @@ -18,11 +18,9 @@ */ package brooklyn.entity.messaging.zookeeper; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.entity.zookeeper.ZooKeeperEnsemble; import brooklyn.entity.zookeeper.ZooKeeperNode; @@ -32,6 +30,8 @@ import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.Uninterruptibles; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 bd5b8cb..871d1dc 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 @@ -23,13 +23,14 @@ import java.util.Map; import com.google.common.collect.ImmutableMap; import com.google.common.reflect.TypeToken; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.trait.HasShortName; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.proxying.ImplementedBy; -import brooklyn.entity.trait.HasShortName; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNodeImpl.java b/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNodeImpl.java index d094c54..1cb3948 100644 --- a/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNodeImpl.java +++ b/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNodeImpl.java @@ -20,10 +20,10 @@ package org.apache.brooklyn.entity.monitoring.monit; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.event.feed.ssh.SshFeed; import brooklyn.event.feed.ssh.SshPollConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 5326b7e..c72343c 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 @@ -28,6 +28,7 @@ import java.nio.charset.Charset; import java.util.Map; import java.util.concurrent.Callable; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +41,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SameServerEntity; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.database.mysql.MySqlNode; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.DependentConfiguration; import brooklyn.location.MachineDetails; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 8534440..e7e7ce0 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 @@ -25,14 +25,15 @@ import com.google.common.base.Predicates; import com.google.common.collect.Multimap; import com.google.common.reflect.TypeToken; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.annotation.Effector; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.DynamicGroup; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerImpl.java ---------------------------------------------------------------------- diff --git a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerImpl.java b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerImpl.java index ac9fab5..bfc7751 100644 --- a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerImpl.java +++ b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerImpl.java @@ -25,6 +25,8 @@ import java.io.StringReader; import java.util.Collection; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,13 +51,11 @@ import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; import com.google.common.collect.Multimaps; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.DynamicGroup; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.entity.group.AbstractMembershipTrackingPolicy; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.Sensor; import brooklyn.location.basic.Machines; import brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 e420b42..f1f7069 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 @@ -20,6 +20,9 @@ package org.apache.brooklyn.entity.network.bind; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; @@ -37,15 +40,12 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import brooklyn.enricher.Enrichers; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindOptions; import brooklyn.entity.rebind.RebindTestFixture; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java index b559357..d62e25e 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java @@ -21,6 +21,7 @@ package org.apache.brooklyn.entity.network.bind; import static org.apache.brooklyn.test.EntityTestUtils.assertAttributeEqualsEventually; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -36,7 +37,6 @@ import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SameServerEntity; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.util.repeat.Repeater; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/DoNothingSoftwareProcessDriver.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/DoNothingSoftwareProcessDriver.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/DoNothingSoftwareProcessDriver.java index 8be9f99..9603de7 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/DoNothingSoftwareProcessDriver.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/DoNothingSoftwareProcessDriver.java @@ -18,8 +18,9 @@ */ package org.apache.brooklyn.entity.network.bind; +import org.apache.brooklyn.api.entity.basic.EntityLocal; + import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; -import brooklyn.entity.basic.EntityLocal; import brooklyn.location.basic.SshMachineLocation; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 85f1dde..ceab6f5 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 @@ -18,12 +18,13 @@ */ package org.apache.brooklyn.entity.network.bind; +import org.apache.brooklyn.api.entity.basic.EntityLocal; + import com.google.common.reflect.TypeToken; import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.EntityLocal; import brooklyn.event.AttributeSensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/TestBindDnsServerImpl.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/TestBindDnsServerImpl.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/TestBindDnsServerImpl.java index e87f1d0..faa806e 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/TestBindDnsServerImpl.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/TestBindDnsServerImpl.java @@ -18,11 +18,11 @@ */ package org.apache.brooklyn.entity.network.bind; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; -import brooklyn.entity.basic.EntityLocal; import brooklyn.location.basic.SshMachineLocation; public class TestBindDnsServerImpl extends BindDnsServerImpl { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraCluster.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraCluster.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraCluster.java index 890ab60..2cdf7ed 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraCluster.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraCluster.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.nosql.cassandra; -import brooklyn.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; /** * @deprecated since 0.7.0; use {@link CassandraDatacenter} which is equivalent but has http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 7ef646f..370706c 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 @@ -22,18 +22,18 @@ import java.math.BigInteger; import java.util.List; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; import org.apache.brooklyn.entity.nosql.cassandra.TokenGenerators.PosNeg63TokenGenerator; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.annotation.Effector; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.database.DatastoreMixins; import brooklyn.entity.effector.Effectors; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; @@ -155,7 +155,7 @@ public interface CassandraDatacenter extends DynamicCluster, DatastoreMixins.Has MethodEffector<Void> UPDATE = new MethodEffector<Void>(CassandraDatacenter.class, "update"); - brooklyn.entity.Effector<String> EXECUTE_SCRIPT = Effectors.effector(DatastoreMixins.EXECUTE_SCRIPT) + org.apache.brooklyn.api.entity.Effector<String> EXECUTE_SCRIPT = Effectors.effector(DatastoreMixins.EXECUTE_SCRIPT) .description("executes the given script contents using cassandra-cli") .buildAbstract(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 9ddd137..cd13794 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 @@ -28,12 +28,13 @@ import java.util.Set; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.enricher.Enrichers; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.DynamicGroup; import brooklyn.entity.basic.Entities; @@ -43,7 +44,6 @@ import brooklyn.entity.basic.ServiceStateLogic.ServiceNotUpLogic; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.DynamicClusterImpl; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java index 23db92c..9a2b6a1 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java @@ -20,14 +20,15 @@ package org.apache.brooklyn.entity.nosql.cassandra; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.annotation.Effector; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.group.DynamicFabric; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java index aff7662..77e3c8f 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java @@ -22,11 +22,12 @@ import java.util.Collection; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.DynamicGroup; import brooklyn.entity.basic.Entities; @@ -35,7 +36,6 @@ import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.DynamicFabricImpl; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 7d0a56d..8b2f755 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 @@ -21,17 +21,18 @@ package org.apache.brooklyn.entity.nosql.cassandra; import java.math.BigInteger; import java.util.Set; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.database.DatastoreMixins; import brooklyn.entity.java.UsesJavaMXBeans; import brooklyn.entity.java.UsesJmx; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicConfigKey; @@ -44,7 +45,7 @@ import brooklyn.util.time.Duration; import com.google.common.reflect.TypeToken; /** - * An {@link brooklyn.entity.Entity} that represents a Cassandra node in a {@link CassandraDatacenter}. + * An {@link org.apache.brooklyn.api.entity.Entity} that represents a Cassandra node in a {@link CassandraDatacenter}. */ @Catalog(name="Apache Cassandra Node", description="Cassandra is a highly scalable, eventually " + "consistent, distributed, structured key-value store which provides a ColumnFamily-based data model " + http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 dedf875..fd7c48d 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 @@ -32,12 +32,12 @@ import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nullable; import javax.management.ObjectName; +import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.enricher.RollingTimeWindowMeanEnricher; import brooklyn.enricher.TimeWeightedDeltaEnricher; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcessImpl; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 917f163..fb77ace 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 @@ -27,6 +27,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.management.TaskWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,10 +37,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.database.DatastoreMixins; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; import brooklyn.entity.java.UsesJmx; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 b009485..7152419 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 @@ -22,12 +22,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 2f06fac..2778229 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 @@ -29,13 +29,14 @@ import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nonnull; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.render.RendererHints; import brooklyn.enricher.Enrichers; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; @@ -44,7 +45,6 @@ import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.effector.Effectors; import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.DynamicClusterImpl; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.DependentConfiguration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 16434fa..7e7a442 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 @@ -20,7 +20,9 @@ package org.apache.brooklyn.entity.nosql.couchbase; import java.net.URI; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; import brooklyn.config.render.RendererHints; import brooklyn.entity.annotation.Effector; @@ -30,7 +32,6 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.effector.Effectors; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; @@ -134,7 +135,7 @@ public interface CouchbaseNode extends SoftwareProcess { MethodEffector<Void> SERVER_ADD_AND_REBALANCE = new MethodEffector<Void>(CouchbaseNode.class, "serverAddAndRebalance"); MethodEffector<Void> REBALANCE = new MethodEffector<Void>(CouchbaseNode.class, "rebalance"); MethodEffector<Void> BUCKET_CREATE = new MethodEffector<Void>(CouchbaseNode.class, "bucketCreate"); - brooklyn.entity.Effector<Void> ADD_REPLICATION_RULE = Effectors.effector(Void.class, "addReplicationRule") + org.apache.brooklyn.api.entity.Effector<Void> ADD_REPLICATION_RULE = Effectors.effector(Void.class, "addReplicationRule") .description("Adds a replication rule from the indicated bucket on the cluster where this node is located " + "to the indicated cluster and optional destination bucket") .parameter(String.class, "fromBucket", "Bucket to be replicated") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeDriver.java index 1ff28fd..48439ce 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeDriver.java @@ -18,7 +18,8 @@ */ package org.apache.brooklyn.entity.nosql.couchbase; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.entity.basic.SoftwareProcessDriver; public interface CouchbaseNodeDriver extends SoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java index a0654db..a5aa061 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java @@ -25,11 +25,11 @@ import java.util.Collection; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; import org.apache.http.auth.UsernamePasswordCredentials; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.entity.effector.EffectorBody; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 d7cba84..b912213 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 @@ -29,11 +29,11 @@ import java.util.concurrent.Callable; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.management.Task; import org.apache.http.auth.UsernamePasswordCredentials; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 384434c..aa3dfd8 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 @@ -18,11 +18,12 @@ */ package org.apache.brooklyn.entity.nosql.couchbase; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java index d2d18da..d4b22c7 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java @@ -26,12 +26,13 @@ import static java.lang.String.format; import java.util.List; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver; + import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.EntityPredicates; -import brooklyn.entity.drivers.downloads.DownloadResolver; import brooklyn.event.basic.DependentConfiguration; import brooklyn.location.OsDetails; import brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBCluster.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBCluster.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBCluster.java index 852a4a4..9104963 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBCluster.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBCluster.java @@ -18,8 +18,9 @@ */ package org.apache.brooklyn.entity.nosql.couchdb; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBClusterImpl.java index 7c576a1..bb9f8bb 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBClusterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBClusterImpl.java @@ -18,11 +18,11 @@ */ package org.apache.brooklyn.entity.nosql.couchdb; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.group.DynamicClusterImpl; -import brooklyn.entity.proxying.EntitySpec; /** * Implementation of {@link CouchDBCluster}. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNode.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNode.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNode.java index 3cba660..a16e610 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNode.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNode.java @@ -18,18 +18,18 @@ */ package org.apache.brooklyn.entity.nosql.couchdb; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; import org.apache.brooklyn.entity.webapp.WebAppService; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.util.flags.SetFromFlag; /** - * An {@link brooklyn.entity.Entity} that represents a CouchDB node in a {@link CouchDBCluster}. + * An {@link org.apache.brooklyn.api.entity.Entity} that represents a CouchDB node in a {@link CouchDBCluster}. */ @Catalog(name="CouchDB Node", description="Apache CouchDB is a database that uses JSON for documents, JavaScript for MapReduce queries, " + http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchCluster.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchCluster.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchCluster.java index 9d5bd78..3b24364 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchCluster.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchCluster.java @@ -18,9 +18,10 @@ */ package org.apache.brooklyn.entity.nosql.elasticsearch; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterImpl.java index 27d4e9e..662da64 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterImpl.java @@ -20,8 +20,9 @@ package org.apache.brooklyn.entity.nosql.elasticsearch; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; + import brooklyn.entity.group.DynamicClusterImpl; -import brooklyn.entity.proxying.EntitySpec; public class ElasticSearchClusterImpl extends DynamicClusterImpl implements ElasticSearchCluster { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java index 4911c04..05e8214 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.entity.nosql.elasticsearch; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; @@ -25,7 +26,6 @@ import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.database.DatastoreMixins; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; @@ -35,7 +35,7 @@ import brooklyn.location.basic.PortRanges; import brooklyn.util.flags.SetFromFlag; /** - * An {@link brooklyn.entity.Entity} that represents an ElasticSearch node + * An {@link org.apache.brooklyn.api.entity.Entity} that represents an ElasticSearch node */ @Catalog(name="Elastic Search Node", description="Elasticsearch is an open-source search server based on Lucene. " + "It provides a distributed, multitenant-capable full-text search engine with a RESTful web interface and " http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java index 74f53e5..25383b8 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java @@ -24,10 +24,11 @@ import java.io.Reader; import java.io.StringReader; import java.util.List; +import org.apache.brooklyn.api.entity.basic.EntityLocal; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Urls; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java index 5f8cc84..81ea23c 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java @@ -18,8 +18,9 @@ */ package org.apache.brooklyn.entity.nosql.mongodb; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.event.basic.AttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java index 4065ec5..398d6be 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java @@ -22,12 +22,12 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.lifecycle.ScriptHelper; import brooklyn.location.OsDetails; import brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClient.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClient.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClient.java index b2eeb59..3dbe34e 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClient.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClient.java @@ -26,8 +26,10 @@ import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.MethodEffector; + +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBShardedDeployment; -import brooklyn.entity.proxying.ImplementedBy; + import brooklyn.util.flags.SetFromFlag; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSshDriver.java index 50ca2ad..c8896e7 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSshDriver.java @@ -23,11 +23,11 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBRouter; import org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBRouterCluster; import org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBShardedDeployment; + import brooklyn.entity.trait.Startable; import brooklyn.event.basic.DependentConfiguration; import brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBReplicaSet.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBReplicaSet.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBReplicaSet.java index b7d91db..850a9d9 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBReplicaSet.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBReplicaSet.java @@ -21,11 +21,12 @@ package org.apache.brooklyn.entity.nosql.mongodb; import java.util.Collection; import java.util.List; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.group.Cluster; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 51bbcd5..fe914b6 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 @@ -34,17 +34,17 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.enricher.Enrichers; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.DynamicClusterImpl; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.event.AttributeSensor; import brooklyn.event.SensorEvent; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServer.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServer.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServer.java index 5300684..745ca20 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServer.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServer.java @@ -19,11 +19,11 @@ package org.apache.brooklyn.entity.nosql.mongodb; import org.bson.BasicBSONObject; - +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.AttributeSensor.SensorPersistenceMode; import brooklyn.event.basic.BasicConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouter.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouter.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouter.java index 48c9c63..eeb625e 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouter.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouter.java @@ -21,11 +21,12 @@ package org.apache.brooklyn.entity.nosql.mongodb.sharding; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SameServerEntity; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 35252ae..eae7485 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 @@ -20,10 +20,11 @@ package org.apache.brooklyn.entity.nosql.mongodb.sharding; import java.util.Collection; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; + import brooklyn.enricher.Enrichers; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SameServerEntityImpl; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.DependentConfiguration; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServer.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServer.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServer.java index acecbc4..584187a 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServer.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServer.java @@ -18,10 +18,9 @@ */ package org.apache.brooklyn.entity.nosql.mongodb.sharding; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.entity.nosql.mongodb.AbstractMongoDBServer; -import brooklyn.entity.proxying.ImplementedBy; - @ImplementedBy(MongoDBConfigServerImpl.class) public interface MongoDBConfigServer extends AbstractMongoDBServer { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerCluster.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerCluster.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerCluster.java index 79f78ac..4c9d7a7 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerCluster.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerCluster.java @@ -18,8 +18,9 @@ */ package org.apache.brooklyn.entity.nosql.mongodb.sharding; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerClusterImpl.java index 34651bb..6f37fab 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerClusterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerClusterImpl.java @@ -20,9 +20,10 @@ package org.apache.brooklyn.entity.nosql.mongodb.sharding; import java.util.Collection; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; + import brooklyn.entity.group.DynamicClusterImpl; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.access.BrooklynAccessUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouter.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouter.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouter.java index 195b10f..7dbdbba 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouter.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouter.java @@ -18,12 +18,12 @@ */ package org.apache.brooklyn.entity.nosql.mongodb.sharding; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; import org.apache.brooklyn.entity.nosql.mongodb.AbstractMongoDBServer; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterCluster.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterCluster.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterCluster.java index 333a1bd..a7a83dd 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterCluster.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterCluster.java @@ -20,8 +20,9 @@ package org.apache.brooklyn.entity.nosql.mongodb.sharding; import java.util.Collection; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterClusterImpl.java index aa1d5af..0d7cefc 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterClusterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterClusterImpl.java @@ -20,13 +20,13 @@ package org.apache.brooklyn.entity.nosql.mongodb.sharding; import java.util.Collection; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.policy.PolicySpec; -import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.DynamicClusterImpl; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardCluster.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardCluster.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardCluster.java index edf7d7a..e62c7c4 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardCluster.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardCluster.java @@ -18,8 +18,9 @@ */ package org.apache.brooklyn.entity.nosql.mongodb.sharding; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.ImplementedBy; @ImplementedBy(MongoDBShardClusterImpl.class) public interface MongoDBShardCluster extends DynamicCluster { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardClusterImpl.java index 7eb2571..1d8fa32 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardClusterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardClusterImpl.java @@ -26,15 +26,15 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBClientSupport; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBReplicaSet; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.group.DynamicClusterImpl; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeployment.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeployment.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeployment.java index 3383887..f47f88e 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeployment.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeployment.java @@ -18,16 +18,16 @@ */ package org.apache.brooklyn.entity.nosql.mongodb.sharding; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBReplicaSet; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.trait.Startable; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 a336c29..4e36250 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 @@ -23,13 +23,14 @@ import static brooklyn.event.basic.DependentConfiguration.attributeWhenReady; import java.util.Collection; import java.util.List; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.enricher.Enrichers; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; @@ -38,7 +39,6 @@ import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.basic.ServiceStateLogic.ServiceNotUpLogic; import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisCluster.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisCluster.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisCluster.java index 26f4f1c..2ac78be 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisCluster.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisCluster.java @@ -18,10 +18,11 @@ */ package org.apache.brooklyn.entity.nosql.redis; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; -import brooklyn.entity.Entity; + import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.trait.Startable; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 4dd8fd0..6968d5e 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 @@ -21,6 +21,8 @@ package org.apache.brooklyn.entity.nosql.redis; import java.util.Collection; import java.util.List; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; + import brooklyn.enricher.Enrichers; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.Lifecycle; @@ -28,7 +30,6 @@ import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers; import brooklyn.entity.basic.ServiceStateLogic.ServiceProblemsLogic; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisShard.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisShard.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisShard.java index 09d71b3..6150916 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisShard.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisShard.java @@ -18,8 +18,8 @@ */ package org.apache.brooklyn.entity.nosql.redis; -import brooklyn.entity.Entity; -import brooklyn.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; @ImplementedBy(RedisShardImpl.class) public interface RedisShard extends Entity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisSlave.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisSlave.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisSlave.java index af91beb..3688057 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisSlave.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisSlave.java @@ -18,8 +18,9 @@ */ package org.apache.brooklyn.entity.nosql.redis; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.basic.BasicConfigKey; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStore.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStore.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStore.java index 8d2cef1..4f30c74 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStore.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStore.java @@ -18,11 +18,12 @@ */ package org.apache.brooklyn.entity.nosql.redis; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey;
