http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 9867be6..291c8b6 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 @@ -21,22 +21,21 @@ package org.apache.brooklyn.entity.messaging.qpid; import java.util.Map; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.config.BasicConfigKey; +import org.apache.brooklyn.core.config.ConfigKeys; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.java.UsesJmx; +import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.messaging.MessageBroker; import org.apache.brooklyn.entity.messaging.amqp.AmqpServer; import org.apache.brooklyn.entity.messaging.jms.JMSBroker; - -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.BasicConfigKey; -import brooklyn.event.basic.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.util.core.flags.SetFromFlag; /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Qpid broker instance, using AMQP 0-10.
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java index f92b824..80215ca 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java @@ -27,13 +27,13 @@ import java.util.concurrent.TimeUnit; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JmxSupport; +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.messaging.jms.JMSBrokerImpl; import org.apache.brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidDestinationImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidDestinationImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidDestinationImpl.java index 79357bc..35e64d4 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidDestinationImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidDestinationImpl.java @@ -23,8 +23,7 @@ import static java.lang.String.format; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import org.apache.brooklyn.api.entity.basic.EntityLocal; -import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.api.internal.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,6 +31,7 @@ import brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.messaging.amqp.AmqpServer; import org.apache.brooklyn.entity.messaging.jms.JMSDestinationImpl; +import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.exceptions.Exceptions; import brooklyn.event.feed.jmx.JmxFeed; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidQueue.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidQueue.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidQueue.java index b2710eb..ed2ba36 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidQueue.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidQueue.java @@ -18,8 +18,7 @@ */ package org.apache.brooklyn.entity.messaging.qpid; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; - +import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.entity.messaging.Queue; @ImplementedBy(QpidQueueImpl.class) http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidSshDriver.java index 9c348c7..fe5da5b 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidSshDriver.java @@ -27,9 +27,9 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidTopic.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidTopic.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidTopic.java index bee9519..1df9bb6 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidTopic.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidTopic.java @@ -18,8 +18,7 @@ */ package org.apache.brooklyn.entity.messaging.qpid; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; - +import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.entity.messaging.Topic; @ImplementedBy(QpidTopicImpl.class) http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 2fd318f..cf7bdd7 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 @@ -23,21 +23,20 @@ import java.util.Map; import com.google.common.annotations.Beta; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.api.event.AttributeSensor; +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.util.flags.SetFromFlag; +import org.apache.brooklyn.core.config.BasicConfigKey; +import org.apache.brooklyn.core.config.ConfigKeys; -import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import org.apache.brooklyn.entity.messaging.MessageBroker; import org.apache.brooklyn.entity.messaging.amqp.AmqpServer; - -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.BasicConfigKey; -import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.event.basic.Sensors; +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; /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Rabbit MQ broker instance, using AMQP 0-9-1. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitBrokerImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitBrokerImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitBrokerImpl.java index 82347bf..1ae9a59 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitBrokerImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitBrokerImpl.java @@ -22,13 +22,13 @@ import static java.lang.String.format; import java.util.Map; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.entity.core.Entities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Objects.ToStringHelper; -import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcessImpl; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitDestination.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitDestination.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitDestination.java index 0f2a7e4..67f8975 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitDestination.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitDestination.java @@ -22,8 +22,7 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.AbstractEntity; +import org.apache.brooklyn.entity.core.AbstractEntity; import org.apache.brooklyn.entity.messaging.amqp.AmqpExchange; import org.apache.brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitQueue.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitQueue.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitQueue.java index cb12b4f..ae84f60 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitQueue.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitQueue.java @@ -19,9 +19,9 @@ package org.apache.brooklyn.entity.messaging.rabbit; import org.apache.brooklyn.entity.messaging.Queue; -import brooklyn.event.feed.ssh.SshFeed; -import brooklyn.event.feed.ssh.SshPollConfig; -import brooklyn.event.feed.ssh.SshPollValue; +import org.apache.brooklyn.sensor.feed.ssh.SshFeed; +import org.apache.brooklyn.sensor.feed.ssh.SshPollConfig; +import org.apache.brooklyn.sensor.feed.ssh.SshPollValue; import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java index a3b592a..7b9da0d 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java @@ -32,9 +32,9 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; -import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.lifecycle.ScriptHelper; +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.messaging.amqp.AmqpServer; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 fd45e3d..08fe5b4 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 @@ -20,21 +20,20 @@ package org.apache.brooklyn.entity.messaging.storm; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.api.event.AttributeSensor; +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.config.render.RendererHints; -import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble; - -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.event.basic.Sensors; +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; /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a Storm node (UI, Nimbus or Supervisor). http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormDeployment.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormDeployment.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormDeployment.java index bc3374c..41a76cf 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormDeployment.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormDeployment.java @@ -20,12 +20,11 @@ package org.apache.brooklyn.entity.messaging.storm; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.core.util.flags.SetFromFlag; - -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.trait.Startable; +import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.trait.Startable; +import org.apache.brooklyn.util.core.flags.SetFromFlag; @Catalog(name="Storm Deployment", description="A Storm cluster. Apache Storm is a distributed realtime computation system. " + "Storm makes it easy to reliably process unbounded streams of data, doing for realtime processing " http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormDeploymentImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormDeploymentImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormDeploymentImpl.java index 0e5d006..93a547b 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormDeploymentImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormDeploymentImpl.java @@ -23,16 +23,15 @@ 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 org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.api.entity.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.enricher.Enrichers; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.BasicStartableImpl; -import brooklyn.entity.group.DynamicCluster; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.group.DynamicCluster; +import org.apache.brooklyn.entity.stock.BasicStartableImpl; import org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble; +import org.apache.brooklyn.sensor.enricher.Enrichers; +import org.apache.brooklyn.util.core.ResourceUtils; public class StormDeploymentImpl extends BasicStartableImpl implements StormDeployment { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormImpl.java index ebc3c3f..71c6531 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormImpl.java @@ -20,12 +20,12 @@ package org.apache.brooklyn.entity.messaging.storm; import javax.management.ObjectName; +import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.util.time.Duration; import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.entity.java.JavaAppUtils; import brooklyn.entity.java.JavaSoftwareProcessDriver; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 a9c5d9e..f7253b5 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 @@ -24,21 +24,19 @@ import java.util.List; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.internal.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble; - -import brooklyn.event.basic.DependentConfiguration; - import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.basic.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/951bad84/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 afd2166..ad4d6a6 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 @@ -21,15 +21,14 @@ package org.apache.brooklyn.entity.zookeeper; import java.util.List; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.api.event.AttributeSensor; +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.util.flags.SetFromFlag; - -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.group.DynamicCluster; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.Sensors; +import org.apache.brooklyn.core.config.ConfigKeys; +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/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java index f9ce930..7162326 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java @@ -23,17 +23,16 @@ import java.util.List; 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.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.core.EntityInternal; +import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; +import org.apache.brooklyn.entity.group.DynamicClusterImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.group.AbstractMembershipTrackingPolicy; -import brooklyn.entity.group.DynamicClusterImpl; - import com.google.common.collect.Lists; public class ZooKeeperEnsembleImpl extends DynamicClusterImpl implements ZooKeeperEnsemble { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 7f0408b..39e43f3 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 @@ -19,16 +19,16 @@ package org.apache.brooklyn.entity.zookeeper; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.api.event.AttributeSensor; +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.util.flags.SetFromFlag; +import org.apache.brooklyn.core.config.ConfigKeys; +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; -import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.event.basic.BasicAttributeSensor; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.PortAttributeSensorAndConfigKey; /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Apache ZooKeeper instance. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java index c93ee1b..f14db20 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java @@ -25,8 +25,8 @@ import java.util.Map; import java.util.concurrent.ExecutionException; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.entity.core.Entities; -import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; import org.apache.brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java index dcd249b..05dbe56 100644 --- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java +++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java @@ -28,13 +28,13 @@ import javax.jms.Session; import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; -import brooklyn.entity.trait.Startable; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java index 6ed13ec..31dcd3c 100644 --- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java +++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java @@ -19,13 +19,13 @@ package org.apache.brooklyn.entity.messaging.activemq; import brooklyn.entity.AbstractGoogleComputeLiveTest; -import brooklyn.entity.trait.Startable; import com.google.common.collect.ImmutableList; import org.apache.activemq.ActiveMQConnectionFactory; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java index 26980c7..7a9dd8f 100644 --- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java +++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java @@ -31,10 +31,13 @@ import javax.jms.Session; import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.test.entity.TestApplication; +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.test.EntityTestUtils; -import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -42,11 +45,8 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.entity.basic.Entities; import brooklyn.entity.java.UsesJmx; import brooklyn.entity.java.UsesJmx.JmxAgentModes; -import brooklyn.entity.trait.Startable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java index 428c0dd..0f4ef30 100644 --- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java +++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java @@ -24,25 +24,21 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.Callable; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; -import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.time.Duration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.entity.basic.Entities; - +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.factory.ApplicationBuilder; import org.apache.brooklyn.entity.messaging.activemq.ActiveMQBroker; - -import brooklyn.entity.trait.Startable; - +import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/kafka/KafkaLiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/kafka/KafkaLiveTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/kafka/KafkaLiveTest.java index 2276fba..29d69bf 100644 --- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/kafka/KafkaLiveTest.java +++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/kafka/KafkaLiveTest.java @@ -23,14 +23,14 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.Callable; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.util.collections.MutableMap; import brooklyn.entity.AbstractEc2LiveTest; -import brooklyn.entity.basic.Entities; -import brooklyn.entity.trait.Startable; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/kafka/KafkaSupport.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/kafka/KafkaSupport.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/kafka/KafkaSupport.java index 0a4f3f2..c524fed 100644 --- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/kafka/KafkaSupport.java +++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/kafka/KafkaSupport.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.messaging.kafka; -import brooklyn.entity.basic.EntityPredicates; +import org.apache.brooklyn.entity.core.EntityPredicates; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/qpid/QpidEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/qpid/QpidEc2LiveTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/qpid/QpidEc2LiveTest.java index c01faab..d926c45 100644 --- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/qpid/QpidEc2LiveTest.java +++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/qpid/QpidEc2LiveTest.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.messaging.qpid; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java index 4739aa0..2909d6c 100644 --- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java +++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java @@ -33,12 +33,16 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.test.entity.TestApplication; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.qpid.client.AMQConnectionFactory; @@ -49,11 +53,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.trait.Startable; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitEc2LiveTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitEc2LiveTest.java index 461ef1a..2661013 100644 --- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitEc2LiveTest.java +++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitEc2LiveTest.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.entity.messaging.rabbit; import static org.testng.Assert.assertEquals; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; @@ -29,6 +29,7 @@ import org.testng.SkipException; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; + import org.apache.brooklyn.entity.messaging.MessageBroker; import org.apache.brooklyn.entity.messaging.amqp.AmqpExchange; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java index f9bcd5c..ce4228c 100644 --- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java +++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java @@ -23,22 +23,20 @@ import static org.testng.Assert.assertFalse; import java.io.IOException; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.test.EntityTestUtils; -import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.entity.basic.Entities; +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.factory.ApplicationBuilder; import org.apache.brooklyn.entity.messaging.MessageBroker; import org.apache.brooklyn.entity.messaging.amqp.AmqpExchange; -import brooklyn.entity.trait.Startable; - +import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import com.google.common.base.Charsets; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 5296bf8..af902d3 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 @@ -23,18 +23,19 @@ import static org.apache.brooklyn.entity.messaging.storm.Storm.ZOOKEEPER_ENSEMBL 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 brooklyn.event.basic.DependentConfiguration.attributeWhenReady; +import static org.apache.brooklyn.sensor.core.DependentConfiguration.attributeWhenReady; import java.io.File; import java.util.Map; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; -import org.apache.brooklyn.core.management.internal.LocalManagementContext; -import org.apache.brooklyn.core.util.ResourceUtils; -import org.apache.brooklyn.core.util.file.ArchiveBuilder; +import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; +import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.core.ResourceUtils; +import org.apache.brooklyn.util.core.file.ArchiveBuilder; import org.apache.brooklyn.util.os.Os; import org.apache.brooklyn.util.time.Duration; import org.apache.brooklyn.util.time.Time; @@ -53,14 +54,10 @@ import backtype.storm.generated.StormTopology; import backtype.storm.testing.TestWordSpout; import backtype.storm.topology.TopologyBuilder; -import brooklyn.entity.BrooklynAppLiveTestSupport; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.Entities; - +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.messaging.storm.topologies.ExclamationBolt; - -import brooklyn.entity.trait.Startable; - +import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormEc2LiveTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormEc2LiveTest.java index 5339616..1096003 100644 --- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormEc2LiveTest.java +++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormEc2LiveTest.java @@ -18,14 +18,15 @@ */ package org.apache.brooklyn.entity.messaging.storm; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; -import brooklyn.entity.basic.Entities; -import brooklyn.entity.trait.Startable; + +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/zookeeper/ZooKeeperEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/zookeeper/ZooKeeperEc2LiveTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/zookeeper/ZooKeeperEc2LiveTest.java index c905f38..c947374 100644 --- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/zookeeper/ZooKeeperEc2LiveTest.java +++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/zookeeper/ZooKeeperEc2LiveTest.java @@ -18,14 +18,15 @@ */ package org.apache.brooklyn.entity.messaging.zookeeper; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; -import brooklyn.entity.basic.Entities; -import brooklyn.entity.trait.Startable; + +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java index c4ca441..48dcb25 100644 --- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java +++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java @@ -18,10 +18,11 @@ */ package org.apache.brooklyn.entity.messaging.zookeeper; -import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.Entities; -import brooklyn.entity.trait.Startable; +import org.apache.brooklyn.core.test.entity.TestApplication; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; @@ -30,10 +31,9 @@ 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.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; -import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 aaebab9..a6c1906 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 @@ -21,21 +21,21 @@ package org.apache.brooklyn.entity.monitoring.monit; import java.util.Map; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.api.entity.trait.HasShortName; -import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.entity.ImplementedBy; +import org.apache.brooklyn.api.objs.HasShortName; +import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.core.Attributes; +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; import com.google.common.reflect.TypeToken; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; -import brooklyn.event.basic.Sensors; @Catalog(name="Monit Node", description="Monit is a free open source utility for managing and monitoring, processes, programs, files, directories and filesystems on a UNIX system") @ImplementedBy(MonitNodeImpl.class) http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 237f8c9..7b64937 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 @@ -23,6 +23,9 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.sensor.feed.ssh.SshFeed; +import org.apache.brooklyn.sensor.feed.ssh.SshPollConfig; +import org.apache.brooklyn.sensor.feed.ssh.SshPollValue; import org.apache.brooklyn.util.text.Strings; import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; @@ -32,9 +35,6 @@ import com.google.common.base.Function; import com.google.common.collect.Iterables; import brooklyn.entity.basic.SoftwareProcessImpl; -import brooklyn.event.feed.ssh.SshFeed; -import brooklyn.event.feed.ssh.SshPollConfig; -import brooklyn.event.feed.ssh.SshPollValue; public class MonitNodeImpl extends SoftwareProcessImpl implements MonitNode { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitSshDriver.java ---------------------------------------------------------------------- diff --git a/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitSshDriver.java b/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitSshDriver.java index 0032515..c24b21d 100644 --- a/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitSshDriver.java +++ b/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitSshDriver.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Map; import org.apache.brooklyn.api.location.OsDetails; +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.os.Os; @@ -33,7 +34,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; -import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.lifecycle.ScriptHelper; public class MonitSshDriver extends AbstractSoftwareProcessSshDriver implements MonitDriver { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 2cd9e49..7719451 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 @@ -27,10 +27,13 @@ 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.api.entity.EntitySpec; import org.apache.brooklyn.api.location.MachineDetails; +import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport; +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; @@ -44,11 +47,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.io.Files; -import brooklyn.entity.BrooklynAppLiveTestSupport; -import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SameServerEntity; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.event.basic.DependentConfiguration; public class MonitIntegrationTest extends BrooklynAppLiveTestSupport { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 2923797..c21a3a8 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 @@ -27,19 +27,19 @@ import com.google.common.reflect.TypeToken; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.api.event.AttributeSensor; +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.util.flags.SetFromFlag; +import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.annotation.Effector; +import org.apache.brooklyn.entity.group.DynamicGroup; -import brooklyn.entity.annotation.Effector; -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.DynamicGroup; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.basic.PortRanges; +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/951bad84/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 30b41e8..a0916da 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 @@ -26,9 +26,13 @@ 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.api.event.Sensor; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.api.sensor.Sensor; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; +import org.apache.brooklyn.entity.group.DynamicGroup; +import org.apache.brooklyn.entity.lifecycle.Lifecycle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,11 +56,7 @@ import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; import com.google.common.collect.Multimaps; -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 org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java index 31c2bfa..9dabcb4 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java @@ -23,10 +23,8 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.Optional; import org.testng.annotations.Parameters; import org.testng.annotations.Test; - -import brooklyn.entity.BrooklynAppLiveTestSupport; - import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport; import org.apache.brooklyn.util.text.Strings; public class BindDnsServerByonLiveTest extends BrooklynAppLiveTestSupport { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 952cd1f..824ff04 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 @@ -21,11 +21,19 @@ 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.api.policy.EnricherSpec; +import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.sensor.EnricherSpec; +import org.apache.brooklyn.core.mgmt.rebind.RebindOptions; +import org.apache.brooklyn.core.mgmt.rebind.RebindTestFixture; +import org.apache.brooklyn.core.test.entity.TestApplication; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.core.EntityPredicates; +import org.apache.brooklyn.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.entity.group.DynamicCluster; +import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.test.EntityTestUtils; -import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; @@ -39,15 +47,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; -import brooklyn.enricher.Enrichers; -import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.EmptySoftwareProcess; -import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityPredicates; -import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.rebind.RebindOptions; -import brooklyn.entity.rebind.RebindTestFixture; public class BindDnsServerIntegrationTest extends RebindTestFixture<TestApplication> { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 c5be4b4..d79d69d 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,10 +21,13 @@ 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.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; -import org.apache.brooklyn.api.policy.EnricherSpec; -import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.api.sensor.EnricherSpec; +import org.apache.brooklyn.core.test.entity.TestApplication; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.util.repeat.Repeater; import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; @@ -35,11 +38,8 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; -import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.EmptySoftwareProcess; -import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SameServerEntity; -import brooklyn.entity.group.DynamicCluster; public class BindDnsServerLiveTest { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 c6c7fcc..928dfe0 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,9 +18,10 @@ */ package org.apache.brooklyn.entity.network.bind; -import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.internal.EntityLocal; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; + import org.apache.brooklyn.location.basic.SshMachineLocation; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 798041b..2e2942d 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,18 +18,17 @@ */ package org.apache.brooklyn.entity.network.bind; -import org.apache.brooklyn.api.entity.basic.EntityLocal; -import org.apache.brooklyn.api.event.AttributeSensor; -import org.apache.brooklyn.api.event.SensorEvent; -import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.sensor.AttributeSensor; +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.sensor.enricher.AbstractEnricher; import com.google.common.reflect.TypeToken; -import brooklyn.enricher.basic.AbstractEnricher; -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.event.basic.Sensors; - public class PrefixAndIdEnricher extends AbstractEnricher { public static final AttributeSensor<String> SENSOR = Sensors.newStringSensor( http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 346b0aa..988d92b 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 @@ -19,10 +19,9 @@ package org.apache.brooklyn.entity.network.bind; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.internal.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.location.basic.SshMachineLocation; public class TestBindDnsServerImpl extends BindDnsServerImpl { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 2cdf7ed..c1c7674 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 org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.ImplementedBy; /** * @deprecated since 0.7.0; use {@link CassandraDatacenter} which is equivalent but has http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 ed767e0..ae8b825 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 @@ -24,24 +24,21 @@ import java.util.Set; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.api.event.AttributeSensor; +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.util.flags.SetFromFlag; +import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.effector.core.Effectors; +import org.apache.brooklyn.effector.core.MethodEffector; import org.apache.brooklyn.entity.nosql.cassandra.TokenGenerators.PosNeg63TokenGenerator; - -import brooklyn.entity.annotation.Effector; -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.MethodEffector; - +import org.apache.brooklyn.entity.annotation.Effector; 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; -import brooklyn.entity.effector.Effectors; -import brooklyn.entity.group.DynamicCluster; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.Sensors; - import com.google.common.base.Supplier; import com.google.common.collect.Multimap; import com.google.common.reflect.TypeToken; @@ -157,7 +154,7 @@ public interface CassandraDatacenter extends DynamicCluster, DatastoreMixins.Has MethodEffector<Void> UPDATE = new MethodEffector<Void>(CassandraDatacenter.class, "update"); - org.apache.brooklyn.api.entity.Effector<String> EXECUTE_SCRIPT = Effectors.effector(DatastoreMixins.EXECUTE_SCRIPT) + org.apache.brooklyn.api.effector.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/brooklyn-library/blob/951bad84/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 43a792f..136d9a2 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 @@ -29,32 +29,30 @@ 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.api.event.AttributeSensor; -import org.apache.brooklyn.api.event.SensorEvent; -import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.policy.PolicySpec; -import org.apache.brooklyn.core.util.ResourceUtils; -import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.api.sensor.SensorEvent; +import org.apache.brooklyn.api.sensor.SensorEventListener; +import org.apache.brooklyn.effector.core.EffectorBody; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.core.EntityPredicates; +import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; +import org.apache.brooklyn.entity.group.DynamicClusterImpl; +import org.apache.brooklyn.entity.group.DynamicGroup; +import org.apache.brooklyn.entity.lifecycle.Lifecycle; +import org.apache.brooklyn.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.enricher.Enrichers; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.DynamicGroup; -import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityPredicates; -import brooklyn.entity.basic.Lifecycle; -import brooklyn.entity.basic.ServiceStateLogic.ServiceNotUpLogic; -import brooklyn.entity.effector.EffectorBody; -import brooklyn.entity.group.AbstractMembershipTrackingPolicy; -import brooklyn.entity.group.DynamicClusterImpl; - import org.apache.brooklyn.location.basic.Machines; +import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.core.ResourceUtils; +import org.apache.brooklyn.util.core.config.ConfigBag; import org.apache.brooklyn.util.text.Strings; import org.apache.brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 da8f798..1ad9cb9 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 @@ -22,15 +22,14 @@ import java.util.Set; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; - -import brooklyn.entity.annotation.Effector; -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.MethodEffector; -import brooklyn.entity.group.DynamicFabric; +import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.effector.core.MethodEffector; +import org.apache.brooklyn.entity.annotation.Effector; +import org.apache.brooklyn.entity.group.DynamicFabric; import com.google.common.base.Function; import com.google.common.collect.Multimap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 95d1b33..9445c6b 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 @@ -23,11 +23,19 @@ 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.api.event.SensorEvent; -import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.api.sensor.SensorEvent; +import org.apache.brooklyn.api.sensor.SensorEventListener; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.core.EntityInternal; +import org.apache.brooklyn.entity.core.EntityPredicates; +import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; +import org.apache.brooklyn.entity.group.DynamicFabricImpl; +import org.apache.brooklyn.entity.group.DynamicGroup; +import org.apache.brooklyn.entity.lifecycle.Lifecycle; import org.apache.brooklyn.util.collections.CollectionFunctionals; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.collections.MutableSet; @@ -35,15 +43,6 @@ import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.DynamicGroup; -import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityPredicates; -import brooklyn.entity.basic.Lifecycle; -import brooklyn.entity.group.AbstractMembershipTrackingPolicy; -import brooklyn.entity.group.DynamicFabricImpl; - import com.google.common.base.Function; import com.google.common.base.Objects; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 f146820..c477539 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 @@ -22,27 +22,27 @@ import java.math.BigInteger; import java.util.Set; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.effector.Effector; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.api.event.AttributeSensor; +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.util.flags.SetFromFlag; +import org.apache.brooklyn.core.config.BasicConfigKey; +import org.apache.brooklyn.core.config.ConfigKeys; -import brooklyn.entity.basic.BrooklynConfigKeys; -import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; +import org.apache.brooklyn.entity.core.BrooklynConfigKeys; import org.apache.brooklyn.entity.database.DatastoreMixins; import brooklyn.entity.java.UsesJavaMXBeans; import brooklyn.entity.java.UsesJmx; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.BasicConfigKey; -import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.basic.PortRanges; +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; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeDriver.java index befaa6d..8a21d52 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.nosql.cassandra; -import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; +import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; import brooklyn.entity.java.JavaSoftwareProcessDriver; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 c906034..3b29242 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 @@ -33,25 +33,19 @@ import javax.annotation.Nullable; import javax.management.ObjectName; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.MachineProvisioningLocation; -import org.apache.brooklyn.core.util.config.ConfigBag; -import org.apache.brooklyn.core.util.text.TemplateProcessor; +import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.effector.core.EffectorBody; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.core.Entities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.enricher.RollingTimeWindowMeanEnricher; import brooklyn.enricher.TimeWeightedDeltaEnricher; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcessImpl; -import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.java.JavaAppUtils; -import brooklyn.event.basic.DependentConfiguration; -import brooklyn.event.basic.Sensors; -import brooklyn.event.feed.function.FunctionFeed; -import brooklyn.event.feed.function.FunctionPollConfig; import brooklyn.event.feed.jmx.JmxAttributePollConfig; import brooklyn.event.feed.jmx.JmxFeed; import brooklyn.event.feed.jmx.JmxHelper; @@ -59,7 +53,13 @@ import brooklyn.event.feed.jmx.JmxOperationPollConfig; import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.cloud.CloudLocationConfig; +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.util.collections.MutableSet; +import org.apache.brooklyn.util.core.config.ConfigBag; +import org.apache.brooklyn.util.core.text.TemplateProcessor; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.guava.Maybe; import org.apache.brooklyn.util.text.Strings;
