http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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/brooklyn-library/blob/c37090c0/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; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeEc2LiveTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeEc2LiveTest.java index 4f54047..907f8b3 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeEc2LiveTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeEc2LiveTest.java @@ -20,6 +20,7 @@ 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.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,8 +28,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; -import brooklyn.entity.AbstractEc2LiveTest; - public class RiakNodeEc2LiveTest extends AbstractEc2LiveTest { @SuppressWarnings("unused") http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeGoogleComputeLiveTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeGoogleComputeLiveTest.java index baed024..6904f0f 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeGoogleComputeLiveTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeGoogleComputeLiveTest.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.AbstractGoogleComputeLiveTest; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import brooklyn.entity.AbstractGoogleComputeLiveTest; - public class RiakNodeGoogleComputeLiveTest extends AbstractGoogleComputeLiveTest { @Override protected void doTest(Location loc) throws Exception { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSoftlayerLiveTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSoftlayerLiveTest.java index a93c5f4..846801f 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSoftlayerLiveTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSoftlayerLiveTest.java @@ -20,13 +20,12 @@ 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.AbstractSoftlayerLiveTest; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.BeforeMethod; import com.google.common.collect.ImmutableList; -import brooklyn.entity.AbstractSoftlayerLiveTest; - public class RiakNodeSoftlayerLiveTest extends AbstractSoftlayerLiveTest { @BeforeMethod(alwaysRun=true) http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/solr/SolrServerEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/solr/SolrServerEc2LiveTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/solr/SolrServerEc2LiveTest.java index 3035602..0c53637 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/solr/SolrServerEc2LiveTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/solr/SolrServerEc2LiveTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertTrue; 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.apache.brooklyn.util.collections.MutableMap; @@ -30,8 +31,6 @@ import org.apache.solr.common.SolrDocument; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.AbstractEc2LiveTest; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainer.java ---------------------------------------------------------------------- diff --git a/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainer.java b/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainer.java index d00af57..f21cf1f 100644 --- a/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainer.java +++ b/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainer.java @@ -29,15 +29,14 @@ import org.apache.brooklyn.core.config.MapConfigKey; 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.java.UsesJava; +import org.apache.brooklyn.entity.java.UsesJmx; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.sensor.core.BasicAttributeSensor; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; -import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.java.UsesJava; -import brooklyn.entity.java.UsesJmx; - /** * This sets up a Karaf OSGi container */ http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerImpl.java ---------------------------------------------------------------------- diff --git a/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerImpl.java b/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerImpl.java index 7cc49eb..6d3c95f 100644 --- a/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerImpl.java +++ b/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerImpl.java @@ -37,7 +37,13 @@ import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.entity.annotation.Effector; import org.apache.brooklyn.entity.annotation.EffectorParam; +import org.apache.brooklyn.entity.java.JmxSupport; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.sensor.feed.ConfigToAttributes; +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.JmxValueFunctions; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.os.Os; @@ -46,13 +52,6 @@ import org.osgi.jmx.JmxConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.SoftwareProcessImpl; -import brooklyn.entity.java.JmxSupport; -import brooklyn.event.feed.jmx.JmxAttributePollConfig; -import brooklyn.event.feed.jmx.JmxFeed; -import brooklyn.event.feed.jmx.JmxHelper; -import brooklyn.event.feed.jmx.JmxValueFunctions; - import com.google.common.base.Function; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafDriver.java ---------------------------------------------------------------------- diff --git a/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafDriver.java b/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafDriver.java index 80e972d..ec90e45 100644 --- a/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafDriver.java +++ b/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafDriver.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.entity.osgi.karaf; import java.io.File; -import brooklyn.entity.java.JavaSoftwareProcessDriver; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessDriver; public interface KarafDriver extends JavaSoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafSshDriver.java ---------------------------------------------------------------------- diff --git a/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafSshDriver.java b/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafSshDriver.java index 0943c12..bb60895 100644 --- a/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafSshDriver.java +++ b/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafSshDriver.java @@ -24,9 +24,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import brooklyn.entity.java.JavaSoftwareProcessSshDriver; - import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerEc2LiveTest.java b/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerEc2LiveTest.java index 9d55da7..e3d3090 100644 --- a/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerEc2LiveTest.java +++ b/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerEc2LiveTest.java @@ -20,14 +20,13 @@ package org.apache.brooklyn.entity.osgi.karaf; 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.apache.brooklyn.util.text.Identifiers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import brooklyn.entity.AbstractEc2LiveTest; - import com.google.common.collect.ImmutableList; public class KarafContainerEc2LiveTest extends AbstractEc2LiveTest { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerTest.java ---------------------------------------------------------------------- diff --git a/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerTest.java b/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerTest.java index cec795c..b3188eb 100644 --- a/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerTest.java +++ b/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerTest.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; @@ -37,9 +38,6 @@ import org.apache.brooklyn.util.text.Identifiers; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.entity.software.SshEffectorTasks; - import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractController.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractController.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractController.java index 42608c0..1e8cc84 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractController.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractController.java @@ -25,11 +25,10 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.entity.group.Cluster; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; -import brooklyn.entity.basic.SoftwareProcess; - /** * Represents a controller mechanism for a {@link Cluster}. */ http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java index 29c3868..2449184 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java @@ -39,12 +39,10 @@ import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; import org.apache.brooklyn.entity.group.Cluster; import org.apache.brooklyn.entity.lifecycle.Lifecycle; import org.apache.brooklyn.entity.lifecycle.ServiceStateLogic; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.entity.trait.Startable; 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.basic.Machines; import org.apache.brooklyn.sensor.feed.ConfigToAttributes; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxController.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxController.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxController.java index 359aef6..0c0309b 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxController.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxController.java @@ -31,12 +31,11 @@ import org.apache.brooklyn.entity.annotation.Effector; import org.apache.brooklyn.entity.annotation.EffectorParam; import org.apache.brooklyn.entity.proxy.AbstractController; import org.apache.brooklyn.entity.proxy.ProxySslConfig; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; -import brooklyn.entity.basic.SoftwareProcess; - import com.google.common.collect.ImmutableMap; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxDriver.java index 48a0534..57968d1 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxDriver.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.proxy.nginx; -import brooklyn.entity.basic.SoftwareProcessDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; public interface NginxDriver extends SoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java index 9a94cfa..685c593 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java @@ -32,12 +32,10 @@ import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.EntityInternal; import org.apache.brooklyn.entity.lifecycle.Lifecycle; import org.apache.brooklyn.entity.proxy.AbstractController; +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.collections.MutableMap; import org.apache.brooklyn.util.core.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppDriver.java index 822519b..496540b 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppDriver.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppDriver.java @@ -21,7 +21,7 @@ package org.apache.brooklyn.entity.webapp; import java.io.File; import java.util.Set; -import brooklyn.entity.java.JavaSoftwareProcessDriver; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessDriver; public interface JavaWebAppDriver extends JavaSoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppService.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppService.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppService.java index 1222e5a..d5e2547 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppService.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppService.java @@ -29,11 +29,10 @@ import org.apache.brooklyn.core.config.BasicConfigKey; 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.java.UsesJava; import org.apache.brooklyn.sensor.core.BasicAttributeSensor; import org.apache.brooklyn.util.core.flags.SetFromFlag; -import brooklyn.entity.java.UsesJava; - public interface JavaWebAppService extends WebAppService, UsesJava { @SetFromFlag("war") http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java index b0563fd..527f964 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.webapp; -import brooklyn.entity.basic.SoftwareProcess; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; public interface JavaWebAppSoftwareProcess extends SoftwareProcess, JavaWebAppService, JavaWebAppService.CanDeployAndUndeploy { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSoftwareProcessImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSoftwareProcessImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSoftwareProcessImpl.java index 2cb81c7..00cd31c 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSoftwareProcessImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSoftwareProcessImpl.java @@ -29,12 +29,11 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.entity.annotation.Effector; import org.apache.brooklyn.entity.annotation.EffectorParam; +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 com.google.common.base.Throwables; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSshDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSshDriver.java index 1002af2..d045305 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSshDriver.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSshDriver.java @@ -24,9 +24,8 @@ import java.io.File; import java.net.URI; import java.util.Set; -import brooklyn.entity.java.JavaSoftwareProcessSshDriver; - import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.core.task.DynamicTasks; import org.apache.brooklyn.util.core.task.Tasks; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java index 74f993e..3e3419d 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java @@ -22,13 +22,12 @@ 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.java.UsesJmx; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; -import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.java.UsesJmx; - @Catalog(name="JBoss Application Server 6", description="AS6: an open source Java application server from JBoss", iconUrl="classpath:///jboss-logo.png") @ImplementedBy(JBoss6ServerImpl.class) public interface JBoss6Server extends JavaWebAppSoftwareProcess, UsesJmx { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java index a819dfb..cd79d3f 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java @@ -26,12 +26,11 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcessImpl; import org.apache.brooklyn.sensor.enricher.Enrichers; +import org.apache.brooklyn.sensor.feed.jmx.JmxAttributePollConfig; +import org.apache.brooklyn.sensor.feed.jmx.JmxFeed; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.event.feed.jmx.JmxAttributePollConfig; -import brooklyn.event.feed.jmx.JmxFeed; - import com.google.common.base.Functions; public class JBoss6ServerImpl extends JavaWebAppSoftwareProcessImpl implements JBoss6Server { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java index 1ccc1f8..35bc26b 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java @@ -29,11 +29,9 @@ import java.util.Map; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.java.UsesJmx; +import org.apache.brooklyn.entity.java.UsesJmx.JmxAgentModes; import org.apache.brooklyn.entity.webapp.JavaWebAppSshDriver; - -import brooklyn.entity.java.UsesJmx; -import brooklyn.entity.java.UsesJmx.JmxAgentModes; - import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java index 6aac6d6..5fc7a23 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java @@ -24,6 +24,7 @@ import org.apache.brooklyn.api.objs.HasShortName; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; @@ -32,8 +33,6 @@ import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.StringAt import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.javalang.JavaClassNames; -import brooklyn.entity.basic.SoftwareProcess; - @Catalog(name="JBoss Application Server 7", description="AS7: an open source Java application server from JBoss", iconUrl="classpath:///jboss-logo.png") @ImplementedBy(JBoss7ServerImpl.class) public interface JBoss7Server extends JavaWebAppSoftwareProcess, HasShortName { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java index 4707500..0acaa95 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java @@ -26,12 +26,10 @@ import java.util.List; import java.util.Map; import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.JavaWebAppSshDriver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6Server.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6Server.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6Server.java index 2ac1ddc..1bce7e7 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6Server.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6Server.java @@ -24,15 +24,14 @@ import org.apache.brooklyn.api.objs.HasShortName; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.java.UsesJmx; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.time.Duration; -import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.java.UsesJmx; - /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Jetty instance. */ http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java index 52c11c8..50d6316 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java @@ -20,17 +20,16 @@ package org.apache.brooklyn.entity.webapp.jetty; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.entity.java.JavaAppUtils; +import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.lifecycle.Lifecycle; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcessImpl; import org.apache.brooklyn.sensor.enricher.Enrichers; +import org.apache.brooklyn.sensor.feed.jmx.JmxAttributePollConfig; +import org.apache.brooklyn.sensor.feed.jmx.JmxFeed; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.java.JavaAppUtils; -import brooklyn.entity.java.UsesJmx; -import brooklyn.event.feed.jmx.JmxAttributePollConfig; -import brooklyn.event.feed.jmx.JmxFeed; - import com.google.common.base.Functions; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppDriver.java index 167f843..01596ab 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppDriver.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.webapp.nodejs; -import brooklyn.entity.basic.SoftwareProcessDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; public interface NodeJsWebAppDriver extends SoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppService.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppService.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppService.java index d7c705e..25ae613 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppService.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppService.java @@ -26,10 +26,8 @@ import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.WebAppService; - -import brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.util.core.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppServiceImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppServiceImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppServiceImpl.java index 408762f..e8c517b 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppServiceImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppServiceImpl.java @@ -19,12 +19,10 @@ package org.apache.brooklyn.entity.webapp.nodejs; import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.entity.webapp.WebAppServiceMethods; 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.ConfigToAttributes; import org.apache.brooklyn.sensor.feed.http.HttpFeed; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java index 82d22ed..db3233f 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java @@ -24,13 +24,11 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.WebAppService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; -import brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.java index 6811cff..d9e2f7f 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.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.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.javalang.JavaClassNames; -import brooklyn.entity.basic.SoftwareProcess; - /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Tomcat instance. */ http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServer.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServer.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServer.java index 319ead4..2f0ee58 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServer.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServer.java @@ -24,11 +24,9 @@ import org.apache.brooklyn.api.objs.HasShortName; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.java.UsesJmx; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; - -import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.java.UsesJmx; - import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.sensor.core.BasicAttributeSensor; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerImpl.java index c3f1fe8..a55fa44 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerImpl.java @@ -22,14 +22,13 @@ import static java.lang.String.format; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.entity.java.JavaAppUtils; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcessImpl; +import org.apache.brooklyn.sensor.feed.jmx.JmxAttributePollConfig; +import org.apache.brooklyn.sensor.feed.jmx.JmxFeed; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.java.JavaAppUtils; -import brooklyn.event.feed.jmx.JmxAttributePollConfig; -import brooklyn.event.feed.jmx.JmxFeed; - import com.google.common.base.Functions; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/TrackingAbstractControllerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/TrackingAbstractControllerImpl.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/TrackingAbstractControllerImpl.java index 90fea43..4291e33 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/TrackingAbstractControllerImpl.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/TrackingAbstractControllerImpl.java @@ -23,11 +23,10 @@ import java.util.List; import java.util.Set; import org.apache.brooklyn.entity.proxy.AbstractControllerImpl; +import org.apache.brooklyn.entity.software.base.test.driver.MockSshDriver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.driver.MockSshDriver; - import com.google.common.collect.Lists; public class TrackingAbstractControllerImpl extends AbstractControllerImpl implements TrackingAbstractController { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxEc2LiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxEc2LiveTest.java index 6f23920..caabac5 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxEc2LiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxEc2LiveTest.java @@ -20,6 +20,8 @@ package org.apache.brooklyn.entity.proxy.nginx; 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.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; @@ -27,9 +29,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import brooklyn.entity.AbstractEc2LiveTest; -import brooklyn.entity.basic.SoftwareProcess; - import com.google.common.collect.ImmutableList; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxHttpsSslIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxHttpsSslIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxHttpsSslIntegrationTest.java index 2258f50..1b5826f 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxHttpsSslIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxHttpsSslIntegrationTest.java @@ -31,6 +31,7 @@ import org.apache.brooklyn.entity.core.EntityInternal; import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.proxy.LoadBalancer; import org.apache.brooklyn.entity.proxy.ProxySslConfig; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; @@ -44,9 +45,6 @@ import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.location.basic.PortRanges; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxIntegrationTest.java index 5c4c381..b688577 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxIntegrationTest.java @@ -33,6 +33,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport; import org.apache.brooklyn.entity.factory.EntityFactory; import org.apache.brooklyn.entity.group.DynamicCluster; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; @@ -47,8 +48,6 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.basic.SoftwareProcess; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java index 1e39ab4..02fde07 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java @@ -43,6 +43,7 @@ import org.apache.brooklyn.entity.lifecycle.Lifecycle; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.proxy.nginx.UrlMapping; import org.apache.brooklyn.entity.proxy.nginx.UrlRewriteRule; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; @@ -53,9 +54,6 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java index f164aa6..c00b514 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java @@ -37,8 +37,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import brooklyn.entity.basic.SoftwareProcessDriver; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterClass; @@ -46,9 +44,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; - -import brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; @@ -66,6 +61,8 @@ import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.EntityInternal; import org.apache.brooklyn.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess;
