http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java index 796c740..c5238c3 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java @@ -22,16 +22,15 @@ import java.util.Arrays; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.testng.annotations.Test; - import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.jclouds.JcloudsLocation; -import brooklyn.util.net.Protocol; -import brooklyn.util.ssh.IptablesCommands; -import brooklyn.util.ssh.IptablesCommands.Chain; -import brooklyn.util.ssh.IptablesCommands.Policy; +import org.apache.brooklyn.util.net.Protocol; +import org.apache.brooklyn.util.ssh.IptablesCommands; +import org.apache.brooklyn.util.ssh.IptablesCommands.Chain; +import org.apache.brooklyn.util.ssh.IptablesCommands.Policy; import com.google.common.collect.ImmutableList;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java index f72b13c..72a9990 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java @@ -23,18 +23,15 @@ import java.util.Arrays; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; - import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode; - import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.net.Protocol; -import brooklyn.util.ssh.IptablesCommands; -import brooklyn.util.ssh.IptablesCommands.Chain; -import brooklyn.util.ssh.IptablesCommands.Policy; +import org.apache.brooklyn.util.net.Protocol; +import org.apache.brooklyn.util.ssh.IptablesCommands; +import org.apache.brooklyn.util.ssh.IptablesCommands.Chain; +import org.apache.brooklyn.util.ssh.IptablesCommands.Policy; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java index 9ec63f6..f9fbc3b 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java @@ -20,21 +20,23 @@ package org.apache.brooklyn.entity.messaging.activemq; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; 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.messaging.MessageBroker; import org.apache.brooklyn.entity.messaging.jms.JMSBroker; +import org.apache.brooklyn.util.time.Duration; + import brooklyn.event.basic.AttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.util.time.Duration; /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single ActiveMQ broker instance. */ http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java index becd7d0..aabd794 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java @@ -27,9 +27,10 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import com.google.common.base.Preconditions; import org.apache.brooklyn.entity.messaging.jms.JMSDestinationImpl; +import org.apache.brooklyn.util.exceptions.Exceptions; + import brooklyn.event.feed.jmx.JmxFeed; import brooklyn.event.feed.jmx.JmxHelper; -import brooklyn.util.exceptions.Exceptions; public abstract class ActiveMQDestinationImpl extends JMSDestinationImpl implements ActiveMQDestination { protected ObjectName brokerMBeanName; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java index 77602e4..82811f8 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java @@ -26,11 +26,12 @@ import java.util.Map; import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; + import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; -import brooklyn.util.os.Os; -import brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBrokerImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBrokerImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBrokerImpl.java index 6fa16a0..5edca3a 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBrokerImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBrokerImpl.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.messaging.jms; -import static brooklyn.util.JavaGroovyEquivalents.groovyTruth; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth; import java.util.Collection; import java.util.Map; @@ -28,11 +28,12 @@ import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.SoftwareProcessImpl; + import org.apache.brooklyn.entity.messaging.Queue; import org.apache.brooklyn.entity.messaging.Topic; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import com.google.common.collect.Lists; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java index d101343..4780094 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java @@ -25,17 +25,18 @@ import java.util.List; import java.util.Map; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.config.ConfigKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; + import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; -import brooklyn.util.os.Os; -import brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; public abstract class AbstractfKafkaSshDriver extends JavaSoftwareProcessSshDriver { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java index dbd1b7b..27f64c9 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java @@ -18,11 +18,10 @@ */ package org.apache.brooklyn.entity.messaging.kafka; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; - import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java index 6ae6b33..adb86ad 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java @@ -20,21 +20,22 @@ package org.apache.brooklyn.entity.messaging.kafka; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.java.UsesJmx; + import org.apache.brooklyn.entity.messaging.MessageBroker; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; + import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.basic.PortRanges; - -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Duration; /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Kafka broker instance. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerSshDriver.java index df9b67d..d50b1bb 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerSshDriver.java @@ -23,11 +23,12 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.java.UsesJmx; import brooklyn.entity.java.UsesJmx.JmxAgentModes; + +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; public class KafkaBrokerSshDriver extends AbstractfKafkaSshDriver implements KafkaBrokerDriver { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaCluster.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaCluster.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaCluster.java index c512400..930f99a 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaCluster.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaCluster.java @@ -24,19 +24,21 @@ 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.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.group.Cluster; import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.trait.Resizable; import brooklyn.entity.trait.Startable; + import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; +import org.apache.brooklyn.util.time.Duration; + import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.util.time.Duration; /** * Provides Kafka cluster functionality through a group of {@link KafkaBroker brokers} controlled http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java index 933d8ce..b330e7a 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java @@ -32,10 +32,12 @@ import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.Entities; import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.trait.Startable; + import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.exceptions.CompoundRuntimeException; + import brooklyn.event.feed.ConfigToAttributes; -import brooklyn.util.collections.MutableList; -import brooklyn.util.exceptions.CompoundRuntimeException; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java index 9bdc33c..5fc213d 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java @@ -19,16 +19,18 @@ package org.apache.brooklyn.entity.messaging.kafka; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.SoftwareProcess; + import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; +import org.apache.brooklyn.util.time.Duration; + import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.time.Duration; /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Kafka zookeeper instance. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperSshDriver.java index 85ab649..761dad0 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperSshDriver.java @@ -20,12 +20,13 @@ package org.apache.brooklyn.entity.messaging.kafka; import java.util.Map; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; + +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; -import static brooklyn.util.text.StringEscapes.BashStringEscapes.escapeLiteralForDoubleQuotedBash; +import static org.apache.brooklyn.util.text.StringEscapes.BashStringEscapes.escapeLiteralForDoubleQuotedBash; public class KafkaZooKeeperSshDriver extends AbstractfKafkaSshDriver implements KafkaZooKeeperDriver { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 3e4a92a..9867be6 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 @@ -22,16 +22,18 @@ import java.util.Map; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; 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.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; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 66ff73d..f92b824 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 @@ -33,11 +33,13 @@ import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JmxSupport; + import org.apache.brooklyn.entity.messaging.jms.JMSBrokerImpl; +import org.apache.brooklyn.util.exceptions.Exceptions; + import brooklyn.event.feed.jmx.JmxAttributePollConfig; import brooklyn.event.feed.jmx.JmxFeed; import brooklyn.event.feed.jmx.JmxHelper; -import brooklyn.util.exceptions.Exceptions; import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 718ce88..79357bc 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 @@ -29,11 +29,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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.exceptions.Exceptions; + import brooklyn.event.feed.jmx.JmxFeed; import brooklyn.event.feed.jmx.JmxHelper; -import brooklyn.util.exceptions.Exceptions; public abstract class QpidDestinationImpl extends JMSDestinationImpl implements QpidDestination { public static final Logger log = LoggerFactory.getLogger(QpidDestination.class); http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidQueueImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidQueueImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidQueueImpl.java index cec93a9..e094a74 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidQueueImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidQueueImpl.java @@ -24,9 +24,10 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import org.apache.brooklyn.entity.messaging.amqp.AmqpExchange; +import org.apache.brooklyn.util.exceptions.Exceptions; + import brooklyn.event.feed.jmx.JmxAttributePollConfig; import brooklyn.event.feed.jmx.JmxFeed; -import brooklyn.util.exceptions.Exceptions; public class QpidQueueImpl extends QpidDestinationImpl implements QpidQueue { public QpidQueueImpl() { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 3c6daf5..9c348c7 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 @@ -29,11 +29,12 @@ import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; + import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; -import brooklyn.util.os.Os; -import brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidTopicImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidTopicImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidTopicImpl.java index 8de02d9..02454fe 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidTopicImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidTopicImpl.java @@ -24,7 +24,7 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import org.apache.brooklyn.entity.messaging.amqp.AmqpExchange; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.Exceptions; public class QpidTopicImpl extends QpidDestinationImpl implements QpidTopic { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 7e0f54e..2fd318f 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 @@ -25,13 +25,15 @@ 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.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; 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; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 5186f25..a3b592a 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 @@ -18,8 +18,8 @@ */ package org.apache.brooklyn.entity.messaging.rabbit; -import static brooklyn.util.ssh.BashCommands.*; import static java.lang.String.format; +import static org.apache.brooklyn.util.ssh.BashCommands.*; import java.util.List; import java.util.Map; @@ -34,11 +34,12 @@ 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.messaging.amqp.AmqpServer; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; -import brooklyn.util.os.Os; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.os.Os; /** * TODO javadoc http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 8c4a4bf..94cdebc 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 @@ -22,14 +22,16 @@ 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.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.config.render.RendererHints; 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; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 8f505a6..bc3374c 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 @@ -21,9 +21,9 @@ 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.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.trait.Startable; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 b2e5436..ebc3c3f 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,6 +20,8 @@ package org.apache.brooklyn.entity.messaging.storm; import javax.management.ObjectName; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,8 +31,6 @@ import brooklyn.entity.java.JavaAppUtils; import brooklyn.entity.java.JavaSoftwareProcessDriver; import brooklyn.event.feed.jmx.JmxFeed; import brooklyn.event.feed.jmx.JmxHelper; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; public class StormImpl extends SoftwareProcessImpl implements Storm { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 1f108a0..a9c5d9e 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 @@ -32,16 +32,19 @@ 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.zookeeper.ZooKeeperEnsemble; + import brooklyn.event.basic.DependentConfiguration; + import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; -import brooklyn.util.os.Os; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import com.google.common.base.Optional; import com.google.common.base.Supplier; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 d29bc91..afd2166 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 @@ -23,9 +23,9 @@ 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.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.group.DynamicCluster; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 6a67394..7f0408b 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 @@ -21,9 +21,9 @@ 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.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.event.basic.BasicAttributeSensor; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 709e44c..c93ee1b 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 @@ -28,11 +28,12 @@ import org.apache.brooklyn.api.entity.Entity; import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; + import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; -import brooklyn.util.os.Os; -import brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 4253569..428c0dd 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 @@ -27,23 +27,24 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; +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.messaging.activemq.ActiveMQBroker; + import brooklyn.entity.trait.Startable; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 c24c7e6..2276fba 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 @@ -25,12 +25,12 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; +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 brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 fcb1033..4739aa0 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 @@ -35,9 +35,12 @@ import javax.jms.TextMessage; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; +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; import org.apache.qpid.configuration.ClientProperties; import org.slf4j.Logger; @@ -51,9 +54,6 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.trait.Startable; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 c85b4fa..5296bf8 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 @@ -34,6 +34,10 @@ 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.test.EntityTestUtils; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -48,16 +52,16 @@ import backtype.storm.generated.InvalidTopologyException; 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.messaging.storm.topologies.ExclamationBolt; + import brooklyn.entity.trait.Startable; + import org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.os.Os; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormGceLiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormGceLiveTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormGceLiveTest.java index 7b84846..e1a9ad4 100644 --- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormGceLiveTest.java +++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormGceLiveTest.java @@ -20,10 +20,9 @@ package org.apache.brooklyn.entity.messaging.storm; import java.util.Map; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.Test; -import brooklyn.util.collections.MutableMap; - @Test(groups="Live") public class StormGceLiveTest extends StormAbstractCloudLiveTest { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 fc27b19..2923797 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 @@ -29,9 +29,9 @@ 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.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.DynamicGroup; @@ -40,8 +40,7 @@ import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.basic.PortRanges; - -import brooklyn.util.net.Cidr; +import org.apache.brooklyn.util.net.Cidr; /** * This sets up a BIND DNS server. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 5e3e331..30b41e8 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 @@ -60,11 +60,10 @@ import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.guava.Maybe; -import brooklyn.util.net.Cidr; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.net.Cidr; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.text.Strings; /** * This sets up a BIND DNS server. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSshDriver.java ---------------------------------------------------------------------- diff --git a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSshDriver.java b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSshDriver.java index e4e3ea5..f7b707a 100644 --- a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSshDriver.java +++ b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSshDriver.java @@ -29,16 +29,17 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; + import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; -import brooklyn.util.net.Protocol; -import brooklyn.util.os.Os; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.ssh.IptablesCommands; -import brooklyn.util.ssh.IptablesCommands.Chain; -import brooklyn.util.ssh.IptablesCommands.Policy; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.net.Protocol; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.ssh.IptablesCommands; +import org.apache.brooklyn.util.ssh.IptablesCommands.Chain; +import org.apache.brooklyn.util.ssh.IptablesCommands.Policy; +import org.apache.brooklyn.util.text.Strings; public class BindDnsServerSshDriver extends AbstractSoftwareProcessSshDriver implements BindDnsServerDriver { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 20c0e36..31c2bfa 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 @@ -27,8 +27,7 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppLiveTestSupport; import org.apache.brooklyn.api.location.Location; - -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.Strings; public class BindDnsServerByonLiveTest extends BrooklynAppLiveTestSupport { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 87d7e76..c5be4b4 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 @@ -25,6 +25,8 @@ import org.apache.brooklyn.api.entity.proxying.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.util.repeat.Repeater; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,8 +40,6 @@ import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SameServerEntity; import brooklyn.entity.group.DynamicCluster; -import brooklyn.util.repeat.Repeater; -import brooklyn.util.time.Duration; public class BindDnsServerLiveTest { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 39807ca..798041b 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 @@ -22,10 +22,10 @@ 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.config.ConfigKey; import com.google.common.reflect.TypeToken; -import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 c21df9d..ed767e0 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 @@ -26,19 +26,21 @@ 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.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.entity.nosql.cassandra.TokenGenerators.PosNeg63TokenGenerator; -import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.MethodEffector; + import org.apache.brooklyn.entity.database.DatastoreMixins; +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 brooklyn.util.time.Duration; import com.google.common.base.Supplier; import com.google.common.collect.Multimap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 5b5cb9b..43a792f 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 @@ -52,12 +52,11 @@ import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.DynamicClusterImpl; import org.apache.brooklyn.location.basic.Machines; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Time; +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.text.Strings; +import org.apache.brooklyn.util.time.Time; import com.google.common.base.Objects; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 8a5fe34..da8f798 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 @@ -25,8 +25,8 @@ 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.location.Location; +import org.apache.brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.MethodEffector; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 a906495..95d1b33 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 @@ -28,6 +28,10 @@ import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.util.collections.CollectionFunctionals; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,10 +43,6 @@ import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.DynamicFabricImpl; -import brooklyn.util.collections.CollectionFunctionals; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.time.Time; import com.google.common.base.Function; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 4fcfd2b..f146820 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 @@ -26,13 +26,15 @@ 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.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; + import org.apache.brooklyn.entity.database.DatastoreMixins; + import brooklyn.entity.java.UsesJavaMXBeans; import brooklyn.entity.java.UsesJmx; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; @@ -41,8 +43,7 @@ import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.basic.PortRanges; - -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Duration; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 b27b957..c906034 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 @@ -59,12 +59,11 @@ import brooklyn.event.feed.jmx.JmxOperationPollConfig; import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.cloud.CloudLocationConfig; - -import brooklyn.util.collections.MutableSet; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 0e8d343..d47edbf 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 @@ -44,7 +44,9 @@ import com.google.common.collect.ImmutableSet; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.entity.database.DatastoreMixins; + import brooklyn.entity.java.JavaSoftwareProcessSshDriver; import brooklyn.entity.java.UsesJmx; import brooklyn.entity.software.SshEffectorTasks; @@ -53,19 +55,18 @@ import brooklyn.event.basic.DependentConfiguration; import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.net.Networking; -import brooklyn.util.os.Os; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; /** * Start a {@link CassandraNode} in a {@link Location} accessible over ssh. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/TokenGenerators.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/TokenGenerators.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/TokenGenerators.java index b1362d2..f29a813 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/TokenGenerators.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/TokenGenerators.java @@ -27,7 +27,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableList; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 a46e1a8..2cfbbc5 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 @@ -26,13 +26,13 @@ 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.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.time.Duration; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.group.DynamicCluster; import brooklyn.event.basic.Sensors; -import brooklyn.util.time.Duration; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 fcb944d..1dd9fbf 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 @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.nosql.couchbase; -import static brooklyn.util.JavaGroovyEquivalents.groovyTruth; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth; import java.util.List; import java.util.Map; @@ -57,19 +57,18 @@ import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.event.feed.http.JsonFunctions; import org.apache.brooklyn.location.access.BrooklynAccessUtils; - -import brooklyn.util.collections.CollectionFunctionals; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.collections.QuorumCheck; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Functionals; -import brooklyn.util.guava.IfFunctions; -import brooklyn.util.math.MathPredicates; -import brooklyn.util.text.ByteSizeStrings; -import brooklyn.util.text.StringFunctions; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.collections.CollectionFunctionals; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.collections.QuorumCheck; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Functionals; +import org.apache.brooklyn.util.guava.IfFunctions; +import org.apache.brooklyn.util.math.MathPredicates; +import org.apache.brooklyn.util.text.ByteSizeStrings; +import org.apache.brooklyn.util.text.StringFunctions; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import com.google.common.base.Function; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 5f3269a..0a5f3d4 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 @@ -23,9 +23,10 @@ import java.net.URI; 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.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.text.ByteSizeStrings; -import brooklyn.config.ConfigKey; import brooklyn.config.render.RendererHints; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; @@ -37,7 +38,6 @@ import brooklyn.entity.effector.Effectors; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; -import brooklyn.util.text.ByteSizeStrings; @Catalog(name="CouchBase Node", description="Couchbase Server is an open source, distributed (shared-nothing architecture) " + "NoSQL document-oriented database that is optimized for interactive applications.") http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 d27f7db..59ea400 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 @@ -48,16 +48,15 @@ import brooklyn.event.feed.http.JsonFunctions; import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.cloud.CloudLocationConfig; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Functionals; -import brooklyn.util.guava.MaybeFunctions; -import brooklyn.util.guava.TypeTokens; -import brooklyn.util.net.Urls; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Functionals; +import org.apache.brooklyn.util.guava.MaybeFunctions; +import org.apache.brooklyn.util.guava.TypeTokens; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Charsets; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 f894937..975975d 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 @@ -18,8 +18,8 @@ */ package org.apache.brooklyn.entity.nosql.couchbase; -import static brooklyn.util.ssh.BashCommands.*; import static java.lang.String.format; +import static org.apache.brooklyn.util.ssh.BashCommands.*; import java.net.URI; import java.util.Arrays; @@ -53,14 +53,13 @@ import brooklyn.event.feed.http.HttpValueFunctions; import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.repeat.Repeater; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.text.NaturalOrderComparator; -import brooklyn.util.text.StringEscapes.BashStringEscapes; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.repeat.Repeater; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.text.NaturalOrderComparator; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.StringEscapes.BashStringEscapes; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 07665a3..e932fd4 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 @@ -21,9 +21,9 @@ package org.apache.brooklyn.entity.nosql.couchbase; 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.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 5d598e5..2cc1544 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 @@ -18,11 +18,11 @@ */ package org.apache.brooklyn.entity.nosql.couchbase; -import static brooklyn.util.ssh.BashCommands.INSTALL_CURL; -import static brooklyn.util.ssh.BashCommands.alternatives; -import static brooklyn.util.ssh.BashCommands.chainGroup; -import static brooklyn.util.ssh.BashCommands.sudo; import static java.lang.String.format; +import static org.apache.brooklyn.util.ssh.BashCommands.INSTALL_CURL; +import static org.apache.brooklyn.util.ssh.BashCommands.alternatives; +import static org.apache.brooklyn.util.ssh.BashCommands.chainGroup; +import static org.apache.brooklyn.util.ssh.BashCommands.sudo; import java.util.List; @@ -37,11 +37,10 @@ import brooklyn.entity.basic.EntityPredicates; import brooklyn.event.basic.DependentConfiguration; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import com.google.common.base.Optional; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 9d89349..ab487d0 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 @@ -20,10 +20,10 @@ package org.apache.brooklyn.entity.nosql.couchdb; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.entity.webapp.WebAppService; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeImpl.java index 7f8f639..ec34610 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeImpl.java @@ -25,6 +25,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcessImpl; import org.apache.brooklyn.entity.webapp.WebAppServiceMethods; +import org.apache.brooklyn.util.guava.Functionals; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +33,6 @@ import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.event.feed.http.HttpValueFunctions; -import brooklyn.util.guava.Functionals; import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java index 845c3a0..ffa785d 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.nosql.couchdb; -import static brooklyn.util.ssh.BashCommands.*; +import static org.apache.brooklyn.util.ssh.BashCommands.*; import java.util.List; import java.util.Map; @@ -32,10 +32,9 @@ import brooklyn.entity.basic.Attributes; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; -import brooklyn.util.os.Os; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.os.Os; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 acea855..ed01f39 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 @@ -21,13 +21,15 @@ package org.apache.brooklyn.entity.nosql.elasticsearch; 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.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; + import org.apache.brooklyn.entity.database.DatastoreMixins; + import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java index eb81a93..4298e83 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java @@ -30,11 +30,10 @@ import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.event.feed.http.JsonFunctions; import org.apache.brooklyn.location.access.BrooklynAccessUtils; - -import brooklyn.util.guava.Functionals; -import brooklyn.util.guava.Maybe; -import brooklyn.util.guava.MaybeFunctions; -import brooklyn.util.guava.TypeTokens; +import org.apache.brooklyn.util.guava.Functionals; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.guava.MaybeFunctions; +import org.apache.brooklyn.util.guava.TypeTokens; import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/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 062666b..183672a 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 @@ -25,15 +25,16 @@ import java.io.StringReader; import java.util.List; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Urls; -import brooklyn.util.os.Os; -import brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; import com.google.common.collect.ImmutableList;
