http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/base/src/test/java/brooklyn/test/JmxService.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/test/JmxService.java b/software/base/src/test/java/brooklyn/test/JmxService.java index 2b3bcfd..6c7184e 100644 --- a/software/base/src/test/java/brooklyn/test/JmxService.java +++ b/software/base/src/test/java/brooklyn/test/JmxService.java @@ -43,10 +43,10 @@ import javax.management.remote.JMXServiceURL; import mx4j.tools.naming.NamingService; import mx4j.tools.naming.NamingServiceMBean; +import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.java.UsesJmx; import brooklyn.event.feed.jmx.JmxHelper;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/main/java/brooklyn/entity/database/DatastoreMixins.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/DatastoreMixins.java b/software/database/src/main/java/brooklyn/entity/database/DatastoreMixins.java index d41559c..7d9bd71 100644 --- a/software/database/src/main/java/brooklyn/entity/database/DatastoreMixins.java +++ b/software/database/src/main/java/brooklyn/entity/database/DatastoreMixins.java @@ -22,9 +22,10 @@ import java.io.InputStream; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.effector.Effectors; import brooklyn.event.AttributeSensor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/main/java/brooklyn/entity/database/crate/CrateNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/crate/CrateNode.java b/software/database/src/main/java/brooklyn/entity/database/crate/CrateNode.java index 7f1dc3d..747d0a3 100644 --- a/software/database/src/main/java/brooklyn/entity/database/crate/CrateNode.java +++ b/software/database/src/main/java/brooklyn/entity/database/crate/CrateNode.java @@ -18,6 +18,8 @@ */ package brooklyn.entity.database.crate; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; @@ -26,7 +28,6 @@ import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.java.UsesJava; import brooklyn.entity.java.UsesJavaMXBeans; import brooklyn.entity.java.UsesJmx; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.AttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/main/java/brooklyn/entity/database/crate/CrateNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/crate/CrateNodeSshDriver.java b/software/database/src/main/java/brooklyn/entity/database/crate/CrateNodeSshDriver.java index a807cbe..1fc8db2 100644 --- a/software/database/src/main/java/brooklyn/entity/database/crate/CrateNodeSshDriver.java +++ b/software/database/src/main/java/brooklyn/entity/database/crate/CrateNodeSshDriver.java @@ -22,10 +22,11 @@ import static java.lang.String.format; import java.util.List; +import org.apache.brooklyn.api.entity.basic.EntityLocal; + import com.google.common.collect.ImmutableList; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; import brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbNode.java b/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbNode.java index 8992b42..461f7d5 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbNode.java +++ b/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbNode.java @@ -18,15 +18,16 @@ */ package brooklyn.entity.database.mariadb; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.trait.HasShortName; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.database.DatabaseNode; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; -import brooklyn.entity.proxying.ImplementedBy; -import brooklyn.entity.trait.HasShortName; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlCluster.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlCluster.java b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlCluster.java index 54e7869..87af343 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlCluster.java +++ b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlCluster.java @@ -20,6 +20,7 @@ package brooklyn.entity.database.mysql; import java.util.Collection; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; import com.google.common.reflect.TypeToken; @@ -28,7 +29,6 @@ import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.database.DatastoreMixins.HasDatastoreUrl; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlClusterImpl.java b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlClusterImpl.java index dfa9fe0..6b780f7 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlClusterImpl.java +++ b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlClusterImpl.java @@ -24,6 +24,10 @@ import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; + import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.base.Predicate; @@ -36,14 +40,11 @@ import com.google.common.reflect.TypeToken; import brooklyn.config.ConfigKey; import brooklyn.enricher.Enrichers; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.basic.ServiceStateLogic.ServiceNotUpLogic; import brooklyn.entity.group.DynamicClusterImpl; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNode.java b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNode.java index c136c2c..dd01079 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNode.java +++ b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNode.java @@ -18,7 +18,10 @@ */ package brooklyn.entity.database.mysql; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.trait.HasShortName; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; @@ -27,8 +30,6 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; -import brooklyn.entity.proxying.ImplementedBy; -import brooklyn.entity.trait.HasShortName; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNodeImpl.java b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNodeImpl.java index 892f552..569cdb3 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNodeImpl.java +++ b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNodeImpl.java @@ -20,10 +20,10 @@ package brooklyn.entity.database.mysql; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.entity.effector.EffectorBody; import brooklyn.event.feed.ssh.SshFeed; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNode.java b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNode.java index 97a835f..3e97b20 100644 --- a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNode.java +++ b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNode.java @@ -18,17 +18,18 @@ */ package brooklyn.entity.database.postgresql; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.trait.HasShortName; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.database.DatabaseNode; import brooklyn.entity.database.DatastoreMixins; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.effector.Effectors; -import brooklyn.entity.proxying.ImplementedBy; -import brooklyn.entity.trait.HasShortName; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.location.basic.PortRanges; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java index 491c8e7..311fa8b 100644 --- a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java +++ b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java @@ -18,11 +18,11 @@ */ package brooklyn.entity.database.postgresql; +import org.apache.brooklyn.api.entity.Effector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EffectorStartableImpl; import brooklyn.entity.basic.Entities; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlSpecs.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlSpecs.java b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlSpecs.java index 9d56913..5d90bdd 100644 --- a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlSpecs.java +++ b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlSpecs.java @@ -18,9 +18,10 @@ */ package brooklyn.entity.database.postgresql; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; + import brooklyn.entity.chef.ChefConfig; import brooklyn.entity.chef.ChefConfig.ChefModes; -import brooklyn.entity.proxying.EntitySpec; /** * Utiltiy for creating specs for {@link PostgreSqlNode} instances. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepNode.java b/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepNode.java index ff6fc51..b25b219 100644 --- a/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepNode.java +++ b/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepNode.java @@ -18,14 +18,15 @@ */ package brooklyn.entity.database.rubyrep; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.database.DatastoreMixins; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java b/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java index d1c4087..e41c7f6 100644 --- a/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java +++ b/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java @@ -25,13 +25,13 @@ import java.net.URISyntaxException; import java.util.List; import java.util.concurrent.ExecutionException; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java index 4f25d91..7bbd063 100644 --- a/software/database/src/test/java/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java @@ -20,6 +20,7 @@ package brooklyn.entity.database.crate; import static org.testng.Assert.assertFalse; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; @@ -30,7 +31,6 @@ import com.google.common.collect.ImmutableList; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java index 0a68c31..31c5687 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.database.mariadb; import java.io.File; import java.net.InetAddress; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -35,7 +36,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java b/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java index 0bb3204..e97da1d 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java +++ b/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java @@ -18,12 +18,12 @@ */ package brooklyn.entity.database.mariadb; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.jclouds.JcloudsLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java b/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java index db7369e..867c12a 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java @@ -20,11 +20,11 @@ package brooklyn.entity.database.mariadb; import java.util.Arrays; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.testng.annotations.Test; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.basic.SshMachineLocation; import brooklyn.location.jclouds.JcloudsLocation; import brooklyn.util.net.Protocol; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterIntegrationTest.java index 037d93a..3bc12eb 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterIntegrationTest.java @@ -18,12 +18,12 @@ */ package brooklyn.entity.database.mysql; +import org.apache.brooklyn.api.entity.Entity; import org.testng.annotations.Test; import com.google.common.collect.Iterables; import brooklyn.entity.BrooklynAppLiveTestSupport; -import brooklyn.entity.Entity; import brooklyn.util.os.Os; public class MySqlClusterIntegrationTest extends BrooklynAppLiveTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java index 368a5f1..b2dc9c3 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals; import java.util.List; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +33,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import brooklyn.entity.database.VogellaExampleAccess; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlIntegrationTest.java index 67397d1..61af5fb 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlIntegrationTest.java @@ -20,6 +20,7 @@ package brooklyn.entity.database.mysql; import java.io.File; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -27,7 +28,6 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppLiveTestSupport; import brooklyn.entity.database.VogellaExampleAccess; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java index 4bd46c2..1d07a6a 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java @@ -18,12 +18,12 @@ */ package brooklyn.entity.database.mysql; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveGceTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveGceTest.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveGceTest.java index 9d2b48c..1474b79 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveGceTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveGceTest.java @@ -18,12 +18,12 @@ */ package brooklyn.entity.database.mysql; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.testng.annotations.Test; import brooklyn.entity.AbstractGoogleComputeLiveTest; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java index d8cdd64..b6ddd6a 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java @@ -20,12 +20,12 @@ package brooklyn.entity.database.mysql; import java.util.Arrays; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.basic.SshMachineLocation; import brooklyn.location.jclouds.JcloudsLocation; import brooklyn.util.net.Protocol; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlRestartIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlRestartIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlRestartIntegrationTest.java index 50100cf..ccc0e19 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlRestartIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlRestartIntegrationTest.java @@ -18,13 +18,13 @@ */ package brooklyn.entity.database.mysql; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; import brooklyn.entity.basic.AbstractSoftwareProcessRestartIntegrationTest; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.proxying.EntitySpec; /** * Tests restart of the software *process* (as opposed to the VM). http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java index 0abebbb..08d1202 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java @@ -22,10 +22,12 @@ import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; import brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import brooklyn.entity.database.postgresql.PostgreSqlNode; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.software.AbstractDockerLiveTest; import brooklyn.location.Location; + import com.google.common.collect.ImmutableList; + +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.testng.annotations.Test; public class MysqlDockerLiveTest extends AbstractDockerLiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java index 4d306c6..a8353cd 100644 --- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java @@ -20,10 +20,12 @@ package brooklyn.entity.database.postgresql; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.software.AbstractDockerLiveTest; import brooklyn.location.Location; + import com.google.common.collect.ImmutableList; + +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.testng.annotations.Test; public class PostgreSqDockerLiveTest extends AbstractDockerLiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java index b568328..605ad58 100644 --- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java @@ -18,12 +18,12 @@ */ package brooklyn.entity.database.postgresql; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java index fcca632..6721d4a 100644 --- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java @@ -18,12 +18,12 @@ */ package brooklyn.entity.database.postgresql; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.testng.annotations.Test; import brooklyn.entity.AbstractGoogleComputeLiveTest; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java index a7c80eb..8910ac0 100644 --- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.database.postgresql; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -31,7 +32,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.management.internal.LocalManagementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java index 0a6a615..267b87d 100644 --- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java @@ -20,11 +20,11 @@ package brooklyn.entity.database.postgresql; import java.util.Arrays; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.testng.annotations.Test; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.basic.PortRanges; import brooklyn.location.basic.SshMachineLocation; import brooklyn.location.jclouds.JcloudsLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRebindIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRebindIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRebindIntegrationTest.java index d74cb15..54b5740 100644 --- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRebindIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRebindIntegrationTest.java @@ -18,11 +18,11 @@ */ package brooklyn.entity.database.postgresql; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindTestFixtureWithApp; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java index d26c7f4..ba2ff29 100644 --- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java @@ -18,13 +18,13 @@ */ package brooklyn.entity.database.postgresql; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; import brooklyn.entity.basic.AbstractSoftwareProcessRestartIntegrationTest; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.proxying.EntitySpec; /** * Tests restart of the software *process* (as opposed to the VM). http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java index 55dae29..2601727 100644 --- a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java @@ -18,13 +18,13 @@ */ package brooklyn.entity.database.rubyrep; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import brooklyn.entity.database.postgresql.PostgreSqlNode; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.basic.PortRanges; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java index 45a8135..8e045d4 100644 --- a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertEquals; import java.util.Arrays; import java.util.List; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -40,7 +41,6 @@ import brooklyn.entity.database.mysql.MySqlIntegrationTest; import brooklyn.entity.database.mysql.MySqlNode; import brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import brooklyn.entity.database.postgresql.PostgreSqlNode; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.PortRanges; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java index 532a4f4..2362819 100644 --- a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java @@ -20,12 +20,12 @@ package brooklyn.entity.database.rubyrep; import java.util.Arrays; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.testng.annotations.Test; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import brooklyn.entity.database.postgresql.PostgreSqlNode; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.basic.PortRanges; import brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/MessageBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/MessageBroker.java b/software/messaging/src/main/java/brooklyn/entity/messaging/MessageBroker.java index 183773e..0fbc0fd 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/MessageBroker.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/MessageBroker.java @@ -18,7 +18,8 @@ */ package brooklyn.entity.messaging; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBroker.java b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBroker.java index 3b8b790..9c937f5 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBroker.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBroker.java @@ -18,7 +18,9 @@ */ package brooklyn.entity.messaging.activemq; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; @@ -26,7 +28,6 @@ import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.java.UsesJmx; import brooklyn.entity.messaging.MessageBroker; import brooklyn.entity.messaging.jms.JMSBroker; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.basic.AttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; @@ -35,7 +36,7 @@ import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.util.flags.SetFromFlag; import brooklyn.util.time.Duration; /** - * An {@link brooklyn.entity.Entity} that represents a single ActiveMQ broker instance. + * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single ActiveMQ broker instance. */ @Catalog(name="ActiveMQ Broker", description="ActiveMQ is an open source message broker which fully implements the Java Message Service 1.1 (JMS)", iconUrl="classpath:///activemq-logo.png") @ImplementedBy(ActiveMQBrokerImpl.class) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java index 83d8b6e..c849df1 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java @@ -21,13 +21,13 @@ package brooklyn.entity.messaging.activemq; import java.util.Map; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Entities; import brooklyn.entity.java.UsesJmx; import brooklyn.entity.messaging.jms.JMSBrokerImpl; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.feed.jmx.JmxAttributePollConfig; import brooklyn.event.feed.jmx.JmxFeed; @@ -35,7 +35,7 @@ import com.google.common.base.Functions; import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Predicates; /** - * An {@link brooklyn.entity.Entity} that represents a single ActiveMQ broker instance. + * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single ActiveMQ broker instance. */ public class ActiveMQBrokerImpl extends JMSBrokerImpl<ActiveMQQueue, ActiveMQTopic> implements ActiveMQBroker { private static final Logger log = LoggerFactory.getLogger(ActiveMQBrokerImpl.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java index fb86982..02b4d29 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java @@ -21,10 +21,11 @@ package brooklyn.entity.messaging.activemq; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; + import com.google.common.base.Preconditions; -import brooklyn.entity.Entity; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.messaging.jms.JMSDestinationImpl; import brooklyn.event.feed.jmx.JmxFeed; import brooklyn.event.feed.jmx.JmxHelper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQQueue.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQQueue.java b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQQueue.java index 92d6abc..458b6f0 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQQueue.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQQueue.java @@ -18,8 +18,9 @@ */ package brooklyn.entity.messaging.activemq; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.entity.messaging.Queue; -import brooklyn.entity.proxying.ImplementedBy; @ImplementedBy(ActiveMQQueueImpl.class) public interface ActiveMQQueue extends ActiveMQDestination, Queue { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQSpecs.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQSpecs.java b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQSpecs.java index 64892c5..4a481ec 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQSpecs.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQSpecs.java @@ -18,7 +18,7 @@ */ package brooklyn.entity.messaging.activemq; -import brooklyn.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; public class ActiveMQSpecs { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQTopic.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQTopic.java b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQTopic.java index 78fe231..304e3e9 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQTopic.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQTopic.java @@ -18,8 +18,9 @@ */ package brooklyn.entity.messaging.activemq; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.entity.messaging.Topic; -import brooklyn.entity.proxying.ImplementedBy; @ImplementedBy(ActiveMQTopicImpl.class) public interface ActiveMQTopic extends ActiveMQDestination, Topic { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/amqp/AmqpServer.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/amqp/AmqpServer.java b/software/messaging/src/main/java/brooklyn/entity/messaging/amqp/AmqpServer.java index 3f8cfc5..a044d45 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/amqp/AmqpServer.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/amqp/AmqpServer.java @@ -18,7 +18,8 @@ */ package brooklyn.entity.messaging.amqp; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.entity.basic.Attributes; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/jms/JMSDestination.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/jms/JMSDestination.java b/software/messaging/src/main/java/brooklyn/entity/messaging/jms/JMSDestination.java index 3964ade..6257551 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/jms/JMSDestination.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/jms/JMSDestination.java @@ -18,7 +18,7 @@ */ package brooklyn.entity.messaging.jms; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; public interface JMSDestination extends Entity { public String getName(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java index d59a248..3b4a4c9 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java @@ -24,12 +24,12 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; import brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBroker.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBroker.java index 702d84e..9d723a6 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBroker.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBroker.java @@ -18,12 +18,13 @@ */ package brooklyn.entity.messaging.kafka; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.java.UsesJmx; import brooklyn.entity.messaging.MessageBroker; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.zookeeper.ZooKeeperNode; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicConfigKey; @@ -34,7 +35,7 @@ import brooklyn.util.flags.SetFromFlag; import brooklyn.util.time.Duration; /** - * An {@link brooklyn.entity.Entity} that represents a single Kafka broker instance. + * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Kafka broker instance. */ @ImplementedBy(KafkaBrokerImpl.class) public interface KafkaBroker extends SoftwareProcess, MessageBroker, UsesJmx, Kafka { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java index 1354d6f..7b810ae 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java @@ -23,13 +23,13 @@ import java.util.concurrent.TimeUnit; import javax.management.ObjectName; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.entity.messaging.MessageBroker; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.zookeeper.ZooKeeperNode; import brooklyn.event.feed.jmx.JmxAttributePollConfig; import brooklyn.event.feed.jmx.JmxFeed; @@ -39,7 +39,7 @@ import com.google.common.base.Functions; import com.google.common.base.Objects.ToStringHelper; /** - * An {@link brooklyn.entity.Entity} that represents a single Kafka broker instance. + * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Kafka broker instance. */ public class KafkaBrokerImpl extends SoftwareProcessImpl implements MessageBroker, KafkaBroker { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java index d6afbc4..631bd10 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java @@ -18,16 +18,17 @@ */ package brooklyn.entity.messaging.kafka; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.group.Cluster; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.trait.Resizable; import brooklyn.entity.trait.Startable; import brooklyn.entity.zookeeper.ZooKeeperNode; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java index 6b81ca0..0f5720f 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java @@ -21,15 +21,15 @@ package brooklyn.entity.messaging.kafka; import java.util.Collection; import java.util.List; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.enricher.Enrichers; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.Entities; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.entity.zookeeper.ZooKeeperNode; import brooklyn.event.feed.ConfigToAttributes; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java index 331c057..fa4e915 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java @@ -18,11 +18,12 @@ */ package brooklyn.entity.messaging.kafka; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.zookeeper.ZooKeeperNode; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicConfigKey; @@ -30,7 +31,7 @@ import brooklyn.util.flags.SetFromFlag; import brooklyn.util.time.Duration; /** - * An {@link brooklyn.entity.Entity} that represents a single Kafka zookeeper instance. + * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Kafka zookeeper instance. */ @ImplementedBy(KafkaZooKeeperImpl.class) public interface KafkaZooKeeper extends ZooKeeperNode, Kafka { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZooKeeperImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZooKeeperImpl.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZooKeeperImpl.java index 375333c..c9a1148 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZooKeeperImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZooKeeperImpl.java @@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory; import brooklyn.entity.zookeeper.AbstractZooKeeperImpl; /** - * An {@link brooklyn.entity.Entity} that represents a single Kafka zookeeper instance. + * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Kafka zookeeper instance. */ public class KafkaZooKeeperImpl extends AbstractZooKeeperImpl implements KafkaZooKeeper { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBroker.java b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBroker.java index c578ecb..5376f2e 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBroker.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBroker.java @@ -20,7 +20,9 @@ package brooklyn.entity.messaging.qpid; import java.util.Map; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; @@ -29,14 +31,13 @@ import brooklyn.entity.java.UsesJmx; import brooklyn.entity.messaging.MessageBroker; import brooklyn.entity.messaging.amqp.AmqpServer; import brooklyn.entity.messaging.jms.JMSBroker; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.util.flags.SetFromFlag; /** - * An {@link brooklyn.entity.Entity} that represents a single Qpid broker instance, using AMQP 0-10. + * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Qpid broker instance, using AMQP 0-10. */ @Catalog(name="Qpid Broker", description="Apache Qpid is an open-source messaging system, implementing the Advanced Message Queuing Protocol (AMQP)", iconUrl="classpath:///qpid-logo.jpeg") @ImplementedBy(QpidBrokerImpl.class) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java index d67ce95..baf487d 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java @@ -27,13 +27,13 @@ import java.util.concurrent.TimeUnit; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JmxSupport; import brooklyn.entity.messaging.jms.JMSBrokerImpl; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.feed.jmx.JmxAttributePollConfig; import brooklyn.event.feed.jmx.JmxFeed; import brooklyn.event.feed.jmx.JmxHelper; @@ -44,7 +44,7 @@ import com.google.common.base.Functions; import com.google.common.base.Objects.ToStringHelper; /** - * An {@link brooklyn.entity.Entity} that represents a single Qpid broker instance, using AMQP 0-10. + * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Qpid broker instance, using AMQP 0-10. */ public class QpidBrokerImpl extends JMSBrokerImpl<QpidQueue, QpidTopic> implements QpidBroker { private static final Logger log = LoggerFactory.getLogger(QpidBrokerImpl.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidDestinationImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidDestinationImpl.java b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidDestinationImpl.java index 93d7a57..83e0af0 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidDestinationImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidDestinationImpl.java @@ -23,10 +23,10 @@ import static java.lang.String.format; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.java.UsesJmx; import brooklyn.entity.messaging.amqp.AmqpServer; import brooklyn.entity.messaging.jms.JMSDestinationImpl; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidQueue.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidQueue.java b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidQueue.java index beff886..42c3065 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidQueue.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidQueue.java @@ -18,8 +18,9 @@ */ package brooklyn.entity.messaging.qpid; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.entity.messaging.Queue; -import brooklyn.entity.proxying.ImplementedBy; @ImplementedBy(QpidQueueImpl.class) public interface QpidQueue extends QpidDestination, Queue { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidTopic.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidTopic.java b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidTopic.java index 1ae3598..3ec1c06 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidTopic.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidTopic.java @@ -18,8 +18,9 @@ */ package brooklyn.entity.messaging.qpid; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.entity.messaging.Topic; -import brooklyn.entity.proxying.ImplementedBy; @ImplementedBy(QpidTopicImpl.class) public interface QpidTopic extends QpidDestination, Topic { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitBroker.java b/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitBroker.java index d425929..442afde 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitBroker.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitBroker.java @@ -22,13 +22,14 @@ import java.util.Map; import com.google.common.annotations.Beta; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.messaging.MessageBroker; import brooklyn.entity.messaging.amqp.AmqpServer; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicConfigKey; @@ -37,7 +38,7 @@ import brooklyn.event.basic.Sensors; import brooklyn.util.flags.SetFromFlag; /** - * An {@link brooklyn.entity.Entity} that represents a single Rabbit MQ broker instance, using AMQP 0-9-1. + * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Rabbit MQ broker instance, using AMQP 0-9-1. */ @Catalog(name="RabbitMQ Broker", description="RabbitMQ is an open source message broker software (i.e. message-oriented middleware) that implements the Advanced Message Queuing Protocol (AMQP) standard", iconUrl="classpath:///RabbitMQLogo.png") @ImplementedBy(RabbitBrokerImpl.class) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitBrokerImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitBrokerImpl.java b/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitBrokerImpl.java index b317bf8..5d96d92 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitBrokerImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitBrokerImpl.java @@ -22,6 +22,7 @@ import static java.lang.String.format; import java.util.Map; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,10 +30,9 @@ import com.google.common.base.Objects.ToStringHelper; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcessImpl; -import brooklyn.entity.proxying.EntitySpec; /** - * An {@link brooklyn.entity.Entity} that represents a single Rabbit MQ broker instance, using AMQP 0-9-1. + * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Rabbit MQ broker instance, using AMQP 0-9-1. */ public class RabbitBrokerImpl extends SoftwareProcessImpl implements RabbitBroker { private static final Logger log = LoggerFactory.getLogger(RabbitBrokerImpl.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/storm/Storm.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/storm/Storm.java b/software/messaging/src/main/java/brooklyn/entity/messaging/storm/Storm.java index f80f12e..5b95356 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/storm/Storm.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/storm/Storm.java @@ -18,14 +18,15 @@ */ package brooklyn.entity.messaging.storm; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; import brooklyn.config.render.RendererHints; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.java.UsesJmx; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.zookeeper.ZooKeeperEnsemble; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; @@ -34,7 +35,7 @@ import brooklyn.event.basic.Sensors; import brooklyn.util.flags.SetFromFlag; /** - * An {@link brooklyn.entity.Entity} that represents a Storm node (UI, Nimbus or Supervisor). + * An {@link org.apache.brooklyn.api.entity.Entity} that represents a Storm node (UI, Nimbus or Supervisor). */ @Catalog(name="Storm Node", description="Apache Storm is a distributed realtime computation system. " + "Storm makes it easy to reliably process unbounded streams of data, doing for realtime processing " http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormDeployment.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormDeployment.java b/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormDeployment.java index a3ec059..978ecce 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormDeployment.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormDeployment.java @@ -18,11 +18,12 @@ */ package brooklyn.entity.messaging.storm; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.trait.Startable; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormDeploymentImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormDeploymentImpl.java b/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormDeploymentImpl.java index df92496..d5b79cc 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormDeploymentImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormDeploymentImpl.java @@ -23,6 +23,7 @@ import static brooklyn.entity.messaging.storm.Storm.Role.NIMBUS; import static brooklyn.entity.messaging.storm.Storm.Role.SUPERVISOR; import static brooklyn.entity.messaging.storm.Storm.Role.UI; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +31,6 @@ import brooklyn.enricher.Enrichers; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BasicStartableImpl; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.zookeeper.ZooKeeperEnsemble; import brooklyn.util.ResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormSshDriver.java b/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormSshDriver.java index 12f73a1..7c7ce24 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormSshDriver.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormSshDriver.java @@ -23,13 +23,13 @@ import static java.lang.String.format; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; import brooklyn.entity.zookeeper.ZooKeeperEnsemble; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/zookeeper/AbstractZooKeeperImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/zookeeper/AbstractZooKeeperImpl.java b/software/messaging/src/main/java/brooklyn/entity/zookeeper/AbstractZooKeeperImpl.java index ab77a10..6e14a42 100644 --- a/software/messaging/src/main/java/brooklyn/entity/zookeeper/AbstractZooKeeperImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/zookeeper/AbstractZooKeeperImpl.java @@ -35,7 +35,7 @@ import com.google.common.base.Functions; import com.google.common.base.Objects.ToStringHelper; /** - * An {@link brooklyn.entity.Entity} that represents a single Apache ZooKeeper instance. + * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Apache ZooKeeper instance. */ public abstract class AbstractZooKeeperImpl extends SoftwareProcessImpl implements ZooKeeperNode { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsemble.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsemble.java b/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsemble.java index 8ddd573..8ef2a66 100644 --- a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsemble.java +++ b/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsemble.java @@ -20,11 +20,12 @@ package brooklyn.entity.zookeeper; import java.util.List; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java b/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java index 4bdd9aa..3a6011b 100644 --- a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java @@ -22,16 +22,16 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.DynamicClusterImpl; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperNode.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperNode.java b/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperNode.java index 8babd7f..02a307a 100644 --- a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperNode.java +++ b/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperNode.java @@ -18,11 +18,12 @@ */ package brooklyn.entity.zookeeper; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; @@ -30,7 +31,7 @@ import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.util.flags.SetFromFlag; /** - * An {@link brooklyn.entity.Entity} that represents a single Apache ZooKeeper instance. + * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Apache ZooKeeper instance. */ @Catalog(name="ZooKeeper Node", description="Apache ZooKeeper is a server which enables " + "highly reliable distributed coordination.") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperNodeImpl.java b/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperNodeImpl.java index 130adc8..0346d02 100644 --- a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperNodeImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperNodeImpl.java @@ -19,7 +19,7 @@ package brooklyn.entity.zookeeper; /** - * An {@link brooklyn.entity.Entity} that represents a single standalone zookeeper instance. + * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single standalone zookeeper instance. */ public class ZooKeeperNodeImpl extends AbstractZooKeeperImpl implements ZooKeeperNode { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java b/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java index 5fa0275..445386b 100644 --- a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java +++ b/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java @@ -24,7 +24,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; import brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java index 5d1c0fa..3a1a6d0 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java @@ -28,11 +28,11 @@ import javax.jms.Session; import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java index eebde2f..59ae310 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java @@ -19,13 +19,13 @@ package brooklyn.entity.messaging.activemq; import brooklyn.entity.AbstractGoogleComputeLiveTest; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; import com.google.common.collect.ImmutableList; import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java index 3235696..a879810 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java @@ -31,6 +31,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -44,7 +45,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.entity.java.UsesJmx; import brooklyn.entity.java.UsesJmx.JmxAgentModes; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location;
