http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 7b64937..e23981f 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 @@ -22,6 +22,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.sensor.feed.ssh.SshFeed; import org.apache.brooklyn.sensor.feed.ssh.SshPollConfig; @@ -34,8 +35,6 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Function; import com.google.common.collect.Iterables; -import brooklyn.entity.basic.SoftwareProcessImpl; - public class MonitNodeImpl extends SoftwareProcessImpl implements MonitNode { private static final Logger LOG = LoggerFactory.getLogger(MonitNodeImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 c24b21d..511b3b0 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 @@ -25,6 +25,8 @@ import java.util.Map; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; +import org.apache.brooklyn.entity.software.base.lifecycle.ScriptHelper; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.os.Os; @@ -33,9 +35,6 @@ import org.apache.brooklyn.util.ssh.BashCommands; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; -import brooklyn.entity.basic.lifecycle.ScriptHelper; - public class MonitSshDriver extends AbstractSoftwareProcessSshDriver implements MonitDriver { private String remoteControlFilePath; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 7719451..41eb9d2 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 @@ -32,6 +32,8 @@ 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.entity.software.base.SameServerEntity; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.test.Asserts; @@ -47,9 +49,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.io.Files; -import brooklyn.entity.basic.SameServerEntity; -import brooklyn.entity.basic.SoftwareProcess; - public class MonitIntegrationTest extends BrooklynAppLiveTestSupport { private static final Logger LOG = LoggerFactory.getLogger(MonitIntegrationTest.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 c21a3a8..b848555 100644 --- a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServer.java +++ b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServer.java @@ -33,9 +33,7 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.entity.annotation.Effector; import org.apache.brooklyn.entity.group.DynamicGroup; - -import brooklyn.entity.basic.SoftwareProcess; - +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerDriver.java ---------------------------------------------------------------------- diff --git a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerDriver.java b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerDriver.java index 50a1994..8eb7d57 100644 --- a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerDriver.java +++ b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerDriver.java @@ -18,9 +18,9 @@ */ package org.apache.brooklyn.entity.network.bind; -import com.google.common.annotations.VisibleForTesting; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; -import brooklyn.entity.basic.SoftwareProcessDriver; +import com.google.common.annotations.VisibleForTesting; public interface BindDnsServerDriver extends SoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 a0916da..6d263b3 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 @@ -33,6 +33,7 @@ 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.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,8 +57,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; import com.google.common.collect.Multimaps; -import brooklyn.entity.basic.SoftwareProcessImpl; - import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.guava.Maybe; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 f7b707a..e60955d 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 @@ -28,8 +28,7 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; - +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; 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/incubator-brooklyn/blob/64c2b2e5/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerEc2LiveTest.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerEc2LiveTest.java index 7347a26..7c6391a 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerEc2LiveTest.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerEc2LiveTest.java @@ -20,10 +20,8 @@ package org.apache.brooklyn.entity.network.bind; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.AbstractEc2LiveTest; - import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.AbstractEc2LiveTest; public class BindDnsServerEc2LiveTest extends AbstractEc2LiveTest { private static final Logger LOG = LoggerFactory.getLogger(BindDnsServerEc2LiveTest.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 824ff04..0b7b90b 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 @@ -32,6 +32,7 @@ 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.entity.software.base.EmptySoftwareProcess; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; @@ -47,8 +48,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; -import brooklyn.entity.basic.EmptySoftwareProcess; - public class BindDnsServerIntegrationTest extends RebindTestFixture<TestApplication> { private static final Logger LOG = LoggerFactory.getLogger(BindDnsServerIntegrationTest.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 d79d69d..7ca5ee6 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 @@ -28,6 +28,8 @@ 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.entity.software.base.EmptySoftwareProcess; +import org.apache.brooklyn.entity.software.base.SameServerEntity; import org.apache.brooklyn.util.repeat.Repeater; import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; @@ -38,9 +40,6 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; -import brooklyn.entity.basic.EmptySoftwareProcess; -import brooklyn.entity.basic.SameServerEntity; - public class BindDnsServerLiveTest { private static final Logger LOG = LoggerFactory.getLogger(BindDnsServerLiveTest.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSoftlayerLiveTest.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSoftlayerLiveTest.java index 01a0d1e..f65672c 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSoftlayerLiveTest.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSoftlayerLiveTest.java @@ -19,10 +19,8 @@ package org.apache.brooklyn.entity.network.bind; import org.testng.annotations.Test; - -import brooklyn.entity.AbstractSoftlayerLiveTest; - import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.AbstractSoftlayerLiveTest; public class BindDnsServerSoftlayerLiveTest extends AbstractSoftlayerLiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 928dfe0..d12269f 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 @@ -19,13 +19,11 @@ package org.apache.brooklyn.entity.network.bind; import org.apache.brooklyn.api.internal.EntityLocal; - -import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; - +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.apache.brooklyn.location.basic.SshMachineLocation; /** - * Implements methods in {@link brooklyn.entity.basic.AbstractSoftwareProcessSshDriver}. + * Implements methods in {@link org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver}. * {@link #isRunning()} returns true. */ public class DoNothingSoftwareProcessDriver extends AbstractSoftwareProcessSshDriver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 c477539..0919476 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 @@ -29,15 +29,11 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; - -import 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 org.apache.brooklyn.entity.java.UsesJavaMXBeans; +import org.apache.brooklyn.entity.java.UsesJmx; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 8a21d52..3893373 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,10 +18,9 @@ */ package org.apache.brooklyn.entity.nosql.cassandra; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessDriver; import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; -import brooklyn.entity.java.JavaSoftwareProcessDriver; - public interface CassandraNodeDriver extends JavaSoftwareProcessDriver { Integer getGossipPort(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 aabb0eb..fd24985 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 @@ -39,16 +39,10 @@ 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.apache.brooklyn.entity.java.JavaAppUtils; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.SoftwareProcessImpl; -import brooklyn.entity.java.JavaAppUtils; -import brooklyn.event.feed.jmx.JmxAttributePollConfig; -import brooklyn.event.feed.jmx.JmxFeed; -import brooklyn.event.feed.jmx.JmxHelper; -import brooklyn.event.feed.jmx.JmxOperationPollConfig; - import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.cloud.CloudLocationConfig; import org.apache.brooklyn.policy.enricher.RollingTimeWindowMeanEnricher; @@ -57,6 +51,10 @@ import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.sensor.feed.function.FunctionFeed; import org.apache.brooklyn.sensor.feed.function.FunctionPollConfig; +import org.apache.brooklyn.sensor.feed.jmx.JmxAttributePollConfig; +import org.apache.brooklyn.sensor.feed.jmx.JmxFeed; +import org.apache.brooklyn.sensor.feed.jmx.JmxHelper; +import org.apache.brooklyn.sensor.feed.jmx.JmxOperationPollConfig; import org.apache.brooklyn.util.collections.MutableSet; import org.apache.brooklyn.util.core.config.ConfigBag; import org.apache.brooklyn.util.core.text.TemplateProcessor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 c8c8042..7ee2b95 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 @@ -41,15 +41,13 @@ import com.google.common.collect.ImmutableSet; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins; - -import brooklyn.entity.java.JavaSoftwareProcessSshDriver; -import brooklyn.entity.java.UsesJmx; -import brooklyn.entity.software.SshEffectorTasks; - +import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; +import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.location.access.BrooklynAccessUtils; 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.sensor.ssh.SshEffectorTasks; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.collections.MutableSet; import org.apache.brooklyn.util.core.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 bea9a5e..7b6d5d8 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java @@ -41,12 +41,10 @@ import org.apache.brooklyn.entity.core.EntityInternal; import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; import org.apache.brooklyn.entity.group.DynamicClusterImpl; import org.apache.brooklyn.entity.lifecycle.ServiceStateLogic; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.trait.Startable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.sensor.enricher.Enrichers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 935eed4..a4d92b6 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java @@ -31,14 +31,13 @@ import org.apache.brooklyn.effector.core.MethodEffector; import org.apache.brooklyn.entity.annotation.Effector; import org.apache.brooklyn.entity.annotation.EffectorParam; import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.text.ByteSizeStrings; -import brooklyn.entity.basic.SoftwareProcess; - @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.") @ImplementedBy(CouchbaseNodeImpl.class) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeDriver.java index 48439ce..b5c797d 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeDriver.java @@ -19,8 +19,7 @@ package org.apache.brooklyn.entity.nosql.couchbase; import org.apache.brooklyn.api.entity.Entity; - -import brooklyn.entity.basic.SoftwareProcessDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; public interface CouchbaseNodeDriver extends SoftwareProcessDriver { public String getOsTag(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 1b53cec..6c9bec8 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 @@ -32,12 +32,10 @@ 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.software.base.SoftwareProcessImpl; import org.apache.http.auth.UsernamePasswordCredentials; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.SoftwareProcessImpl; - import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.cloud.CloudLocationConfig; import org.apache.brooklyn.sensor.feed.http.HttpFeed; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 cbc2457..b637210 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 @@ -38,15 +38,13 @@ import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.drivers.downloads.BasicDownloadRequirement; import org.apache.brooklyn.entity.drivers.downloads.DownloadProducerFromUrlAttribute; import org.apache.brooklyn.entity.lifecycle.ServiceStateLogic; +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.apache.http.auth.UsernamePasswordCredentials; - -import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; -import brooklyn.entity.software.SshEffectorTasks; - import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.sensor.feed.http.HttpValueFunctions; +import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.http.HttpTool; import org.apache.brooklyn.util.core.http.HttpToolResponse; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 55a02dc..9d7d000 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGateway.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGateway.java @@ -23,13 +23,12 @@ 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.entity.software.base.SoftwareProcess; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; -import brooklyn.entity.basic.SoftwareProcess; - @ImplementedBy(CouchbaseSyncGatewayImpl.class) public interface CouchbaseSyncGateway extends SoftwareProcess { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayDriver.java index c7feab6..1b29e9f 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.nosql.couchbase; -import brooklyn.entity.basic.SoftwareProcessDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; public interface CouchbaseSyncGatewayDriver extends SoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java index 4c1ed12..1931f74 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java @@ -18,9 +18,8 @@ */ package org.apache.brooklyn.entity.nosql.couchbase; -import brooklyn.entity.basic.SoftwareProcessImpl; - import org.apache.brooklyn.core.config.render.RendererHints; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.sensor.feed.http.HttpFeed; import org.apache.brooklyn.sensor.feed.http.HttpPollConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 7c31138..7f15f35 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 @@ -32,9 +32,7 @@ import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.EntityPredicates; - -import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; - +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 a4e1ab2..dd7aef7 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 @@ -22,12 +22,11 @@ import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; -import brooklyn.entity.basic.SoftwareProcess; - /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a CouchDB node in a {@link CouchDBCluster}. */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeDriver.java index 14386a0..59a04b9 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.nosql.couchdb; -import brooklyn.entity.basic.SoftwareProcessDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; public interface CouchDBNodeDriver extends SoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 d51d8e5..163e126 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 @@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcessImpl; import org.apache.brooklyn.entity.webapp.WebAppServiceMethods; import org.apache.brooklyn.sensor.feed.http.HttpFeed; @@ -32,8 +33,6 @@ import org.apache.brooklyn.util.guava.Functionals; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.SoftwareProcessImpl; - import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 14682c0..3ef5c16 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 @@ -26,11 +26,9 @@ import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; - import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; 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/incubator-brooklyn/blob/64c2b2e5/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 34b3cba..8bc238a 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 @@ -23,10 +23,8 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; - -import brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeDriver.java index bc0e57c..82640cd 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.nosql.elasticsearch; -import brooklyn.entity.basic.SoftwareProcessDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; public interface ElasticSearchNodeDriver extends SoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 e62d9ce..30e0401 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 @@ -21,9 +21,7 @@ package org.apache.brooklyn.entity.nosql.elasticsearch; import static com.google.common.base.Preconditions.checkNotNull; import org.apache.brooklyn.api.sensor.AttributeSensor; - -import brooklyn.entity.basic.SoftwareProcessImpl; - +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.sensor.feed.http.HttpFeed; import org.apache.brooklyn.sensor.feed.http.HttpPollConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 a060646..61f9e01 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 @@ -27,9 +27,7 @@ import java.util.List; import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.entity.core.Entities; - -import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; - +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.net.Urls; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java index 1847609..159314c 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java @@ -21,13 +21,12 @@ package org.apache.brooklyn.entity.nosql.mongodb; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.sensor.core.AttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; -import brooklyn.entity.basic.SoftwareProcess; - public interface AbstractMongoDBServer extends SoftwareProcess, Entity { // TODO Need to properly test v2.4.x and v2.5.x support. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java index b524c74..3b5ddc6 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java @@ -25,12 +25,10 @@ import java.util.Map; import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; +import org.apache.brooklyn.entity.software.base.lifecycle.ScriptHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; -import brooklyn.entity.basic.lifecycle.ScriptHelper; - import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientDriver.java index 4bbfabd..f48f743 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.nosql.mongodb; -import brooklyn.entity.basic.SoftwareProcessDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; public interface MongoDBClientDriver extends SoftwareProcessDriver { void runScript(String preStart, String scriptName); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientImpl.java index c8683a0..9a1a0e9 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientImpl.java @@ -18,10 +18,9 @@ */ package org.apache.brooklyn.entity.nosql.mongodb; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.entity.trait.Startable; -import brooklyn.entity.basic.SoftwareProcessImpl; - public class MongoDBClientImpl extends SoftwareProcessImpl implements MongoDBClient { @Override http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBDriver.java index b7d93f0..e66b8e7 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.nosql.mongodb; -import brooklyn.entity.basic.SoftwareProcessDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; public interface MongoDBDriver extends SoftwareProcessDriver { } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java index f930e4a..89d7504 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java @@ -25,12 +25,10 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.config.render.RendererHints; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.bson.BasicBSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.SoftwareProcessImpl; - import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.sensor.feed.function.FunctionFeed; import org.apache.brooklyn.sensor.feed.function.FunctionPollConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouter.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouter.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouter.java index 5fde133..490455c 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouter.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouter.java @@ -26,11 +26,10 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.software.base.SameServerEntity; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; -import brooklyn.entity.basic.SameServerEntity; - import com.google.common.reflect.TypeToken; @ImplementedBy(CoLocatedMongoDBRouterImpl.class) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouterImpl.java index 5aaad97..ac25e48 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/CoLocatedMongoDBRouterImpl.java @@ -23,12 +23,11 @@ import java.util.Collection; 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.software.base.SameServerEntityImpl; import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.sensor.enricher.Enrichers; -import brooklyn.entity.basic.SameServerEntityImpl; - import com.google.common.base.Predicates; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerDriver.java index 7963b22..9ccaccd 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.nosql.mongodb.sharding; -import brooklyn.entity.basic.SoftwareProcessDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; public interface MongoDBConfigServerDriver extends SoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerImpl.java index b8ce2b8..faa6ed6 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerImpl.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.nosql.mongodb.sharding; -import brooklyn.entity.basic.SoftwareProcessImpl; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; public class MongoDBConfigServerImpl extends SoftwareProcessImpl implements MongoDBConfigServer { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterDriver.java index 3c7a30c..5ca17ac 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.nosql.mongodb.sharding; -import brooklyn.entity.basic.SoftwareProcessDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; public interface MongoDBRouterDriver extends SoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterImpl.java index 4d471ef..5698ee6 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterImpl.java @@ -22,11 +22,10 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBClientSupport; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.sensor.feed.function.FunctionFeed; import org.apache.brooklyn.sensor.feed.function.FunctionPollConfig; -import brooklyn.entity.basic.SoftwareProcessImpl; - import com.google.common.base.Functions; public class MongoDBRouterImpl extends SoftwareProcessImpl implements MongoDBRouter { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStore.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStore.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStore.java index a9b388a..9f27f5f 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStore.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStore.java @@ -23,13 +23,12 @@ 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.entity.software.base.SoftwareProcess; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; -import brooklyn.entity.basic.SoftwareProcess; - /** * An entity that represents a Redis key-value store service. */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreDriver.java index ba77cfd..63424ba 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.nosql.redis; -import brooklyn.entity.basic.SoftwareProcessDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; public interface RedisStoreDriver extends SoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreImpl.java index 020e03f..c92f678 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreImpl.java @@ -24,11 +24,9 @@ import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.SoftwareProcessImpl; - import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.sensor.feed.ssh.SshFeed; import org.apache.brooklyn.sensor.feed.ssh.SshPollConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java index 279185d..4c10689 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java @@ -24,11 +24,9 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; - import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNode.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNode.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNode.java index a8c014d..ca8eac2 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNode.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNode.java @@ -30,14 +30,13 @@ import org.apache.brooklyn.effector.core.MethodEffector; import org.apache.brooklyn.entity.annotation.Effector; import org.apache.brooklyn.entity.annotation.EffectorParam; import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.java.UsesJava; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.sensor.core.AttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; -import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.java.UsesJava; - import com.google.common.collect.ImmutableList; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeDriver.java index b9339cf..f42c85d 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeDriver.java @@ -18,10 +18,10 @@ */ package org.apache.brooklyn.entity.nosql.riak; -import brooklyn.entity.basic.SoftwareProcessDriver; - import java.util.List; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; + public interface RiakNodeDriver extends SoftwareProcessDriver { String getRiakEtcDir(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java index 9894f10..aa74dff 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java @@ -30,10 +30,8 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.entity.webapp.WebAppServiceMethods; - -import brooklyn.entity.basic.SoftwareProcessImpl; - import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.cloud.CloudLocationConfig; import org.apache.brooklyn.sensor.core.AttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java index cbf515f..d3953dc 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java @@ -36,18 +36,15 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import brooklyn.entity.java.JavaSoftwareProcessSshDriver; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.lifecycle.ScriptHelper; -import brooklyn.entity.software.SshEffectorTasks; - import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; +import org.apache.brooklyn.entity.software.base.lifecycle.ScriptHelper; import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.task.DynamicTasks; import org.apache.brooklyn.util.core.task.ssh.SshTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java index 31268bf..1b89e07 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java @@ -25,12 +25,10 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.entity.core.BrooklynConfigKeys; - -import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.java.UsesJava; -import brooklyn.entity.java.UsesJavaMXBeans; -import brooklyn.entity.java.UsesJmx; - +import org.apache.brooklyn.entity.java.UsesJava; +import org.apache.brooklyn.entity.java.UsesJavaMXBeans; +import org.apache.brooklyn.entity.java.UsesJmx; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerDriver.java index 72e1049..866aedb 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerDriver.java @@ -18,8 +18,8 @@ */ package org.apache.brooklyn.entity.nosql.solr; -import brooklyn.entity.basic.SoftwareProcessDriver; -import brooklyn.entity.java.JavaSoftwareProcessDriver; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; public interface SolrServerDriver extends JavaSoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerImpl.java index 4454908..128bd4b 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerImpl.java @@ -18,9 +18,8 @@ */ package org.apache.brooklyn.entity.nosql.solr; -import brooklyn.entity.basic.SoftwareProcessImpl; - import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.sensor.feed.http.HttpFeed; import org.apache.brooklyn.sensor.feed.http.HttpPollConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerSshDriver.java index d76259d..3c41f95 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerSshDriver.java @@ -24,13 +24,12 @@ import java.util.List; import java.util.Map; import java.util.Set; -import brooklyn.entity.java.JavaSoftwareProcessSshDriver; -import brooklyn.entity.java.UsesJmx; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; +import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.file.ArchiveUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterTest.java index 285f398..4a3676d 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterTest.java @@ -30,6 +30,8 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.EntityInternal; +import org.apache.brooklyn.entity.software.base.EmptySoftwareProcess; +import org.apache.brooklyn.entity.software.base.EmptySoftwareProcessSshDriver; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.util.core.ResourceUtils; import org.apache.brooklyn.util.core.text.TemplateProcessor; @@ -40,10 +42,6 @@ import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.entity.basic.EmptySoftwareProcess; -import brooklyn.entity.basic.EmptySoftwareProcessSshDriver; - import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricTest.java index e906ae9..24ff8ba 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricTest.java @@ -35,6 +35,7 @@ import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.EntityInternal; import org.apache.brooklyn.entity.lifecycle.Lifecycle; import org.apache.brooklyn.entity.lifecycle.ServiceStateLogic; +import org.apache.brooklyn.entity.software.base.EmptySoftwareProcess; import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.util.time.Duration; @@ -42,9 +43,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.entity.basic.EmptySoftwareProcess; - import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeEc2LiveTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeEc2LiveTest.java index d416379..3899c3b 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeEc2LiveTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeEc2LiveTest.java @@ -20,13 +20,12 @@ package org.apache.brooklyn.entity.nosql.cassandra; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.entity.nosql.cassandra.AstyanaxSupport.AstyanaxSample; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.AbstractEc2LiveTest; - import com.google.common.collect.ImmutableList; public class CassandraNodeEc2LiveTest extends AbstractEc2LiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayEc2LiveTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayEc2LiveTest.java index 7dc1fd9..651c8ef 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayEc2LiveTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayEc2LiveTest.java @@ -23,13 +23,12 @@ import java.util.Map; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; -import brooklyn.entity.AbstractEc2LiveTest; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeEc2LiveTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeEc2LiveTest.java index a9e5371..13a3e60 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeEc2LiveTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeEc2LiveTest.java @@ -20,13 +20,12 @@ package org.apache.brooklyn.entity.nosql.couchdb; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.AbstractEc2LiveTest; - import com.google.common.collect.ImmutableList; public class CouchDBNodeEc2LiveTest extends AbstractEc2LiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBEc2LiveTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBEc2LiveTest.java index e943323..6306b4e 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBEc2LiveTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBEc2LiveTest.java @@ -18,8 +18,6 @@ */ package org.apache.brooklyn.entity.nosql.mongodb; -import brooklyn.entity.AbstractEc2LiveTest; - import com.google.common.collect.ImmutableList; import com.mongodb.DBObject; @@ -31,6 +29,7 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.test.EntityTestUtils; public class MongoDBEc2LiveTest extends AbstractEc2LiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBReplicaSetEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBReplicaSetEc2LiveTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBReplicaSetEc2LiveTest.java index eb9b8c3..7095c82 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBReplicaSetEc2LiveTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBReplicaSetEc2LiveTest.java @@ -18,8 +18,6 @@ */ package org.apache.brooklyn.entity.nosql.mongodb; -import brooklyn.entity.AbstractEc2LiveTest; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.mongodb.DBObject; @@ -28,6 +26,7 @@ import groovy.time.TimeDuration; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.test.Asserts; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBRestartIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBRestartIntegrationTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBRestartIntegrationTest.java index 6cde664..17f5c6b 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBRestartIntegrationTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBRestartIntegrationTest.java @@ -20,13 +20,12 @@ package org.apache.brooklyn.entity.nosql.mongodb; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer; +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessRestartIntegrationTest; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import brooklyn.entity.basic.AbstractSoftwareProcessRestartIntegrationTest; -import brooklyn.entity.basic.SoftwareProcess; - /** * Tests restart of the software *process* (as opposed to the VM). */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBSoftLayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBSoftLayerLiveTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBSoftLayerLiveTest.java index 9ed7400..be6c33b 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBSoftLayerLiveTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBSoftLayerLiveTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.AbstractSoftlayerLiveTest; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,8 +31,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; import com.mongodb.DBObject; -import brooklyn.entity.AbstractSoftlayerLiveTest; - public class MongoDBSoftLayerLiveTest extends AbstractSoftlayerLiveTest { @SuppressWarnings("unused") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentEc2LiveTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentEc2LiveTest.java index b567edd..90fc928 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentEc2LiveTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentEc2LiveTest.java @@ -23,6 +23,7 @@ import groovy.time.TimeDuration; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBReplicaSet; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer; @@ -30,8 +31,6 @@ import org.apache.brooklyn.test.Asserts; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.entity.AbstractEc2LiveTest; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/redis/RedisEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/redis/RedisEc2LiveTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/redis/RedisEc2LiveTest.java index 774b6de..2db5287 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/redis/RedisEc2LiveTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/redis/RedisEc2LiveTest.java @@ -22,13 +22,12 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import brooklyn.entity.AbstractEc2LiveTest; - import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakClusterEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakClusterEc2LiveTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakClusterEc2LiveTest.java index 5e61a1a..aca9019 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakClusterEc2LiveTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakClusterEc2LiveTest.java @@ -20,14 +20,13 @@ package org.apache.brooklyn.entity.nosql.riak; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import brooklyn.entity.AbstractEc2LiveTest; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables;
