http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java index f80d09a..0f41114 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java @@ -25,16 +25,26 @@ 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 org.apache.brooklyn.api.event.AttributeSensor; -import org.apache.brooklyn.api.event.SensorEvent; -import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.api.sensor.SensorEvent; +import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.core.util.task.DynamicTasks; -import org.apache.brooklyn.core.util.task.TaskBuilder; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.core.EntityInternal; +import org.apache.brooklyn.entity.core.EntityPredicates; +import org.apache.brooklyn.entity.group.DynamicClusterImpl; +import org.apache.brooklyn.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic; +import org.apache.brooklyn.sensor.core.DependentConfiguration; +import org.apache.brooklyn.sensor.core.Sensors; +import org.apache.brooklyn.sensor.enricher.Enrichers; +import org.apache.brooklyn.sensor.feed.function.FunctionFeed; +import org.apache.brooklyn.sensor.feed.function.FunctionPollConfig; import org.apache.brooklyn.util.collections.CollectionFunctionals; +import org.apache.brooklyn.util.core.task.DynamicTasks; +import org.apache.brooklyn.util.core.task.TaskBuilder; import org.apache.brooklyn.util.guava.Functionals; import org.apache.brooklyn.util.guava.IfFunctions; import org.apache.brooklyn.util.text.Identifiers; @@ -51,17 +61,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.reflect.TypeToken; -import brooklyn.enricher.Enrichers; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityPredicates; -import brooklyn.entity.basic.ServiceStateLogic.ServiceNotUpLogic; -import brooklyn.entity.group.DynamicClusterImpl; -import brooklyn.event.basic.DependentConfiguration; -import brooklyn.event.basic.Sensors; -import brooklyn.event.feed.function.FunctionFeed; -import brooklyn.event.feed.function.FunctionPollConfig; - // https://dev.mysql.com/doc/refman/5.7/en/replication-howto.html // TODO CREATION_SCRIPT_CONTENTS executed before replication setup so it is not replicated to slaves
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlDriver.java index 0fc89ef..b11d22b 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlDriver.java @@ -18,9 +18,7 @@ */ package org.apache.brooklyn.entity.database.mysql; -import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; - -import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; +import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; import brooklyn.entity.basic.SoftwareProcessDriver; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java index 6d521ab..b9e9f2c 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java @@ -19,28 +19,26 @@ package org.apache.brooklyn.entity.database.mysql; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.api.entity.trait.HasShortName; -import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.entity.ImplementedBy; +import org.apache.brooklyn.api.objs.HasShortName; +import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.config.MapConfigKey; -import brooklyn.entity.annotation.Effector; -import brooklyn.entity.annotation.EffectorParam; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.basic.SoftwareProcess; +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.database.DatastoreMixins.DatastoreCommon; - -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; -import brooklyn.event.basic.MapConfigKey; -import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.event.basic.Sensors; - import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.Sensors; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; +import org.apache.brooklyn.util.core.flags.SetFromFlag; @Catalog(name="MySql Node", description="MySql is an open source relational database management system (RDBMS)", iconUrl="classpath:///mysql-logo-110x57.png") @ImplementedBy(MySqlNodeImpl.class) http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java index 73204a8..5d1462f 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java @@ -21,19 +21,19 @@ package org.apache.brooklyn.entity.database.mysql; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.effector.core.EffectorBody; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.SoftwareProcessImpl; -import brooklyn.entity.effector.EffectorBody; -import brooklyn.event.feed.ssh.SshFeed; -import brooklyn.event.feed.ssh.SshPollConfig; -import brooklyn.event.feed.ssh.SshPollValue; import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.sensor.feed.ssh.SshFeed; +import org.apache.brooklyn.sensor.feed.ssh.SshPollConfig; +import org.apache.brooklyn.sensor.feed.ssh.SshPollValue; import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.core.config.ConfigBag; import org.apache.brooklyn.util.guava.Maybe; import org.apache.brooklyn.util.text.Identifiers; import org.apache.brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java index af93827..6e68d6a 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java @@ -37,19 +37,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.Entities; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins; import brooklyn.entity.software.SshEffectorTasks; import org.apache.brooklyn.api.location.OsDetails; -import org.apache.brooklyn.core.util.task.DynamicTasks; -import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.location.basic.BasicOsDetails.OsVersions; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.core.task.DynamicTasks; +import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.io.FileUtil; import org.apache.brooklyn.util.net.Urls; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlDriver.java index f7e331d..f8b6bad 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlDriver.java @@ -18,9 +18,7 @@ */ package org.apache.brooklyn.entity.database.postgresql; -import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; - -import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; +import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; import brooklyn.entity.basic.SoftwareProcessDriver; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java index 8f00fcf..3e3835e 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java @@ -19,24 +19,22 @@ package org.apache.brooklyn.entity.database.postgresql; import org.apache.brooklyn.api.catalog.Catalog; -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.api.effector.Effector; +import org.apache.brooklyn.api.entity.ImplementedBy; +import org.apache.brooklyn.api.objs.HasShortName; import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.config.ConfigKeys; -import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; +import org.apache.brooklyn.effector.core.Effectors; import org.apache.brooklyn.entity.database.DatabaseNode; import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; - -import brooklyn.entity.effector.Effectors; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.PortAttributeSensorAndConfigKey; - import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.util.core.flags.SetFromFlag; /** * PostgreSQL database node entity. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java index d8aad4b..69a5363 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java @@ -18,29 +18,29 @@ */ package org.apache.brooklyn.entity.database.postgresql; -import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.effector.Effector; import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.core.util.ResourceUtils; -import org.apache.brooklyn.core.util.config.ConfigBag; -import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.effector.core.EffectorBody; +import org.apache.brooklyn.effector.core.Effectors; +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.stock.EffectorStartableImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.EffectorStartableImpl; -import brooklyn.entity.basic.Entities; import brooklyn.entity.chef.ChefConfig; import brooklyn.entity.chef.ChefLifecycleEffectorTasks; import brooklyn.entity.chef.ChefServerTasks; -import brooklyn.entity.effector.EffectorBody; -import brooklyn.entity.effector.Effectors; import brooklyn.entity.software.SshEffectorTasks; -import brooklyn.event.feed.ssh.SshFeed; -import brooklyn.event.feed.ssh.SshPollConfig; import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.sensor.feed.ssh.SshFeed; +import org.apache.brooklyn.sensor.feed.ssh.SshPollConfig; import org.apache.brooklyn.util.collections.Jsonya; +import org.apache.brooklyn.util.core.ResourceUtils; +import org.apache.brooklyn.util.core.config.ConfigBag; +import org.apache.brooklyn.util.core.task.DynamicTasks; import org.apache.brooklyn.util.guava.Maybe; import org.apache.brooklyn.util.ssh.BashCommands; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java index 5cc9fd8..13537a1 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java @@ -18,12 +18,12 @@ */ package org.apache.brooklyn.entity.database.postgresql; -import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.effector.core.EffectorBody; +import org.apache.brooklyn.util.core.config.ConfigBag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.SoftwareProcessImpl; -import brooklyn.entity.effector.EffectorBody; public class PostgreSqlNodeImpl extends SoftwareProcessImpl implements PostgreSqlNode { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSpecs.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSpecs.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSpecs.java index 5e24275..f560add 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSpecs.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSpecs.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.database.postgresql; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import brooklyn.entity.chef.ChefConfig; import brooklyn.entity.chef.ChefConfig.ChefModes; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java index 3d911c9..5ec85de 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java @@ -39,13 +39,14 @@ import java.io.InputStream; import javax.annotation.Nullable; import org.apache.brooklyn.api.location.OsDetails; -import org.apache.brooklyn.core.util.task.DynamicTasks; -import org.apache.brooklyn.core.util.task.ssh.SshTasks; -import org.apache.brooklyn.core.util.task.ssh.SshTasks.OnFailingTask; -import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.core.task.DynamicTasks; +import org.apache.brooklyn.util.core.task.ssh.SshTasks; +import org.apache.brooklyn.util.core.task.ssh.SshTasks.OnFailingTask; +import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.net.Urls; import org.apache.brooklyn.util.os.Os; @@ -58,13 +59,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; -import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.SoftwareProcess; +import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.database.DatastoreMixins; import brooklyn.entity.software.SshEffectorTasks; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import com.google.common.base.Charsets; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNode.java index 5c386b8..8d7ddfb 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNode.java @@ -19,21 +19,20 @@ package org.apache.brooklyn.entity.database.rubyrep; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.entity.ImplementedBy; +import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.config.ConfigKeys; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; +import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; - -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; -import brooklyn.event.basic.Sensors; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.Sensors; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; +import org.apache.brooklyn.util.core.flags.SetFromFlag; @Catalog(name = "RubyRep Node", description = "RubyRep is a database replication system", iconUrl = "classpath:///rubyrep-logo.jpeg") @ImplementedBy(RubyRepNodeImpl.class) http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNodeImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNodeImpl.java index 0843f3b..86aeafe 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNodeImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNodeImpl.java @@ -20,14 +20,13 @@ package org.apache.brooklyn.entity.database.rubyrep; import java.net.URI; -import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcessImpl; +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; +import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.util.time.Duration; -import brooklyn.event.basic.DependentConfiguration; - public class RubyRepNodeImpl extends SoftwareProcessImpl implements RubyRepNode { @Override http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java index 1009a7d..c915556 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java +++ b/software/database/src/main/java/org/apache/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.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.core.Entities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java index e91b4ad..126fb08 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java @@ -20,18 +20,18 @@ package org.apache.brooklyn.entity.database.crate; import static org.testng.Assert.assertFalse; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.core.test.entity.TestApplication; +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.test.EntityTestUtils; -import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; -import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.entity.basic.Entities; -import brooklyn.entity.trait.Startable; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; public class CrateNodeIntegrationTest { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java index ecaeab3..86fb752 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java @@ -21,11 +21,11 @@ package org.apache.brooklyn.entity.database.mariadb; import java.io.File; import java.net.InetAddress; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.core.config.BrooklynProperties; -import org.apache.brooklyn.core.management.internal.LocalManagementContext; -import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.api.mgmt.ManagementContext; +import org.apache.brooklyn.core.internal.BrooklynProperties; +import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; +import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; @@ -34,12 +34,10 @@ import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.entity.basic.Entities; - +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; +import org.apache.brooklyn.entity.factory.ApplicationBuilder; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java index 6fbf43e..80961dd 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java @@ -18,14 +18,14 @@ */ package org.apache.brooklyn.entity.database.mariadb; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; + import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; - import org.apache.brooklyn.location.jclouds.JcloudsLocation; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java index 6d4d4ef..3476163 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.entity.database.mariadb; import java.util.Arrays; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.testng.annotations.Test; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterIntegrationTest.java index e9d9c2d..1bf6ccb 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterIntegrationTest.java @@ -19,13 +19,12 @@ package org.apache.brooklyn.entity.database.mysql; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport; import org.apache.brooklyn.util.os.Os; import org.testng.annotations.Test; import com.google.common.collect.Iterables; -import brooklyn.entity.BrooklynAppLiveTestSupport; - public class MySqlClusterIntegrationTest extends BrooklynAppLiveTestSupport { @Test(groups = {"Integration"}) http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java index 43d1dee..0bdf7f6 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java @@ -22,10 +22,10 @@ import static org.testng.Assert.assertEquals; import java.util.List; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.test.Asserts; -import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlIntegrationTest.java index f435525..0ea106f 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlIntegrationTest.java @@ -20,14 +20,12 @@ package org.apache.brooklyn.entity.database.mysql; import java.io.File; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; - -import brooklyn.entity.BrooklynAppLiveTestSupport; - import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java index 69afffc..1d32bbe 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java @@ -18,11 +18,12 @@ */ package org.apache.brooklyn.entity.database.mysql; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; + import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveGceTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveGceTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveGceTest.java index 3af4daa..dbc87e1 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveGceTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveGceTest.java @@ -18,11 +18,12 @@ */ package org.apache.brooklyn.entity.database.mysql; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; import brooklyn.entity.AbstractGoogleComputeLiveTest; + import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java index 6e8807c..31fbd78 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java @@ -20,8 +20,8 @@ package org.apache.brooklyn.entity.database.mysql; import java.util.Arrays; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.core.config.BrooklynProperties; +import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.core.internal.BrooklynProperties; import org.testng.annotations.Test; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlRestartIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlRestartIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlRestartIntegrationTest.java index b0f0f72..cf7f749 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlRestartIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlRestartIntegrationTest.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.database.mysql; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java index 4bffa18..f22cf7b 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java @@ -20,11 +20,12 @@ package org.apache.brooklyn.entity.database.mysql; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; + import brooklyn.entity.software.AbstractDockerLiveTest; import com.google.common.collect.ImmutableList; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java index 9789d18..1f7b94a 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java @@ -20,11 +20,12 @@ package org.apache.brooklyn.entity.database.postgresql; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; + import brooklyn.entity.software.AbstractDockerLiveTest; import com.google.common.collect.ImmutableList; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java index d1a3589..51c49a7 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java @@ -25,19 +25,19 @@ import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.entity.basic.Entities; import brooklyn.entity.chef.ChefLiveTestSupport; +import org.apache.brooklyn.effector.core.EffectorTasks; +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; -import brooklyn.entity.effector.EffectorTasks; import brooklyn.entity.software.SshEffectorTasks; import org.apache.brooklyn.api.location.PortRange; -import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; import org.apache.brooklyn.util.time.Duration; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java index b65716b..eb432c8 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java @@ -18,11 +18,12 @@ */ package org.apache.brooklyn.entity.database.postgresql; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; + import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java index bec33c1..0428f5d 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java @@ -18,11 +18,12 @@ */ package org.apache.brooklyn.entity.database.postgresql; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; import brooklyn.entity.AbstractGoogleComputeLiveTest; + import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java index fa41367..1d10e9b 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java @@ -18,22 +18,20 @@ */ package org.apache.brooklyn.entity.database.postgresql; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.core.config.BrooklynProperties; -import org.apache.brooklyn.core.management.internal.LocalManagementContext; -import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.api.mgmt.ManagementContext; +import org.apache.brooklyn.core.internal.BrooklynProperties; +import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; +import org.apache.brooklyn.core.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.entity.basic.Entities; - +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; +import org.apache.brooklyn.entity.factory.ApplicationBuilder; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java index c5238c3..264ff70 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.entity.database.postgresql; import java.util.Arrays; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.testng.annotations.Test; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRebindIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRebindIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRebindIntegrationTest.java index 8c3ee48..7f0d632 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRebindIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRebindIntegrationTest.java @@ -18,12 +18,11 @@ */ package org.apache.brooklyn.entity.database.postgresql; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.core.mgmt.rebind.RebindTestFixtureWithApp; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.entity.rebind.RebindTestFixtureWithApp; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java index 4597d18..970d3ff 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.database.postgresql; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java index 8686c5e..52b919f 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java @@ -18,15 +18,15 @@ */ package org.apache.brooklyn.entity.database.rubyrep; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; + import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode; - import org.apache.brooklyn.location.basic.PortRanges; public class RubyRepEc2LiveTest extends AbstractEc2LiveTest { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java index 2ea37c4..69f5c9e 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java @@ -23,27 +23,25 @@ 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.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; -import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.core.config.BrooklynProperties; -import org.apache.brooklyn.core.management.internal.LocalManagementContext; -import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.api.mgmt.ManagementContext; +import org.apache.brooklyn.core.internal.BrooklynProperties; +import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; +import org.apache.brooklyn.core.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.entity.basic.Entities; - +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.entity.database.mysql.MySqlIntegrationTest; import org.apache.brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode; +import org.apache.brooklyn.entity.factory.ApplicationBuilder; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.PortRanges; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java index 72a9990..d8946c7 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.entity.database.rubyrep; import java.util.Arrays; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/MessageBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/MessageBroker.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/MessageBroker.java index 2d22e03..5718aaf 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/MessageBroker.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/MessageBroker.java @@ -19,9 +19,8 @@ package org.apache.brooklyn.entity.messaging; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.event.AttributeSensor; - -import brooklyn.event.basic.Sensors; +import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.sensor.core.Sensors; /** * Marker interface identifying message brokers. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Queue.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Queue.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Queue.java index 9c1aca5..cfe2ab2 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Queue.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Queue.java @@ -18,10 +18,9 @@ */ package org.apache.brooklyn.entity.messaging; -import org.apache.brooklyn.api.event.AttributeSensor; - -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.Sensors; +import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.Sensors; /** * An interface that describes a messaging queue. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Topic.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Topic.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Topic.java index ac71226..f4d2539 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Topic.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/Topic.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.messaging; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; /** * An interface that describes a messaging topic. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java index f9fbc3b..f154f81 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java @@ -19,24 +19,23 @@ package org.apache.brooklyn.entity.messaging.activemq; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.config.BasicConfigKey; +import org.apache.brooklyn.core.config.ConfigKeys; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.java.UsesJmx; +import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.messaging.MessageBroker; import org.apache.brooklyn.entity.messaging.jms.JMSBroker; +import org.apache.brooklyn.sensor.core.AttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; +import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.time.Duration; - -import brooklyn.event.basic.AttributeSensorAndConfigKey; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; -import brooklyn.event.basic.BasicConfigKey; -import brooklyn.event.basic.PortAttributeSensorAndConfigKey; /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single ActiveMQ broker instance. */ http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java index 3907d76..7dcf3be 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java @@ -21,13 +21,15 @@ package org.apache.brooklyn.entity.messaging.activemq; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.Entities; import brooklyn.entity.java.UsesJmx; + +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.messaging.jms.JMSBrokerImpl; + import brooklyn.event.feed.jmx.JmxAttributePollConfig; import brooklyn.event.feed.jmx.JmxFeed; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java index aabd794..ae11770 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java @@ -22,7 +22,7 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.internal.EntityLocal; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQQueue.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQQueue.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQQueue.java index e8c8a15..550724b 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQQueue.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQQueue.java @@ -18,8 +18,7 @@ */ package org.apache.brooklyn.entity.messaging.activemq; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; - +import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.entity.messaging.Queue; @ImplementedBy(ActiveMQQueueImpl.class) http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSpecs.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSpecs.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSpecs.java index 813cba0..34a3b1d 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSpecs.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSpecs.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.messaging.activemq; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; public class ActiveMQSpecs { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java index 82811f8..c7cf623 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java @@ -24,9 +24,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQTopic.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQTopic.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQTopic.java index 536ce09..d81c562 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQTopic.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQTopic.java @@ -18,8 +18,7 @@ */ package org.apache.brooklyn.entity.messaging.activemq; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; - +import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.entity.messaging.Topic; @ImplementedBy(ActiveMQTopicImpl.class) http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpExchange.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpExchange.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpExchange.java index f04c116..a188a6e 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpExchange.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpExchange.java @@ -18,10 +18,9 @@ */ package org.apache.brooklyn.entity.messaging.amqp; -import org.apache.brooklyn.api.event.Sensor; -import org.apache.brooklyn.core.util.flags.SetFromFlag; - -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.api.sensor.Sensor; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.util.core.flags.SetFromFlag; /** * An interface that describes an AMQP exchange. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpServer.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpServer.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpServer.java index 97cce88..865ffb9 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpServer.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/amqp/AmqpServer.java @@ -19,10 +19,9 @@ package org.apache.brooklyn.entity.messaging.amqp; import org.apache.brooklyn.api.entity.Entity; - -import brooklyn.entity.basic.Attributes; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; /** * Marker interface identifying AMQP servers. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBrokerImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBrokerImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBrokerImpl.java index 5edca3a..73b05a7 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBrokerImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBrokerImpl.java @@ -26,9 +26,9 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.SoftwareProcessImpl; +import org.apache.brooklyn.entity.lifecycle.Lifecycle; import org.apache.brooklyn.entity.messaging.Queue; import org.apache.brooklyn.entity.messaging.Topic; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSDestinationImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSDestinationImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSDestinationImpl.java index dbd100f..96ae157 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSDestinationImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSDestinationImpl.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.messaging.jms; -import brooklyn.entity.basic.AbstractEntity; +import org.apache.brooklyn.entity.core.AbstractEntity; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java index 4780094..b6176a7 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java @@ -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.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.entity.core.Entities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; import org.apache.brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java index 27f64c9..fc31708 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java @@ -19,13 +19,12 @@ package org.apache.brooklyn.entity.messaging.kafka; import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.core.util.flags.SetFromFlag; -import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.util.core.flags.SetFromFlag; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; /** * Shared Kafka broker and zookeeper properties. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java index adb86ad..52130cf 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java @@ -18,23 +18,21 @@ */ package org.apache.brooklyn.entity.messaging.kafka; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.entity.ImplementedBy; +import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.config.BasicConfigKey; +import org.apache.brooklyn.core.config.ConfigKeys; -import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.messaging.MessageBroker; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; - -import brooklyn.event.basic.BasicConfigKey; -import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.event.basic.Sensors; - import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.Sensors; +import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.time.Duration; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java index b8a9076..5da2114 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java @@ -23,14 +23,16 @@ import java.util.concurrent.TimeUnit; import javax.management.ObjectName; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcessImpl; + +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.messaging.MessageBroker; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; + import brooklyn.event.feed.jmx.JmxAttributePollConfig; import brooklyn.event.feed.jmx.JmxFeed; import brooklyn.event.feed.jmx.JmxHelper; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaCluster.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaCluster.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaCluster.java index 930f99a..e43cdc3 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaCluster.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaCluster.java @@ -20,26 +20,23 @@ package org.apache.brooklyn.entity.messaging.kafka; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.entity.Group; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.entity.ImplementedBy; +import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.core.util.flags.SetFromFlag; - -import brooklyn.entity.basic.BrooklynConfigKeys; -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.group.Cluster; -import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.trait.Resizable; -import brooklyn.entity.trait.Startable; - +import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.core.BrooklynConfigKeys; +import org.apache.brooklyn.entity.group.Cluster; +import org.apache.brooklyn.entity.group.DynamicCluster; +import org.apache.brooklyn.entity.trait.Resizable; +import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; +import org.apache.brooklyn.sensor.core.BasicAttributeSensor; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.time.Duration; -import brooklyn.event.basic.BasicAttributeSensor; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; - /** * Provides Kafka cluster functionality through a group of {@link KafkaBroker brokers} controlled * by a single {@link KafkaZookeeper zookeeper} entity. @@ -50,7 +47,7 @@ import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; * <p> * The contents of this entity are: * <ul> - * <li>a {@link brooklyn.entity.group.DynamicCluster} of {@link KafkaBroker}s + * <li>a {@link org.apache.brooklyn.entity.group.DynamicCluster} of {@link KafkaBroker}s * <li>a {@link KafkaZookeeper} or {@link Zookeeper} * <li>a {@link org.apache.brooklyn.api.policy.Policy} to resize the broker cluster * </ul> http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java index b330e7a..338f46d 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java @@ -22,23 +22,20 @@ 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.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.enricher.Enrichers; -import brooklyn.entity.basic.AbstractEntity; -import brooklyn.entity.basic.Entities; -import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.trait.Startable; - +import org.apache.brooklyn.entity.core.AbstractEntity; +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.group.DynamicCluster; +import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; +import org.apache.brooklyn.sensor.enricher.Enrichers; +import org.apache.brooklyn.sensor.feed.ConfigToAttributes; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.exceptions.CompoundRuntimeException; -import brooklyn.event.feed.ConfigToAttributes; - import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java index 5fc213d..0cc8b22 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java @@ -18,20 +18,19 @@ */ package org.apache.brooklyn.entity.messaging.kafka; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.config.BasicConfigKey; -import brooklyn.entity.annotation.Effector; -import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.SoftwareProcess; +import org.apache.brooklyn.entity.annotation.Effector; +import org.apache.brooklyn.entity.annotation.EffectorParam; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.time.Duration; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.BasicConfigKey; - /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Kafka zookeeper instance. */ http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperImpl.java index 7764450..6dcb219 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperImpl.java @@ -18,10 +18,9 @@ */ package org.apache.brooklyn.entity.messaging.kafka; -import brooklyn.entity.annotation.EffectorParam; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - +import org.apache.brooklyn.entity.annotation.EffectorParam; import org.apache.brooklyn.entity.zookeeper.AbstractZooKeeperImpl; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperSshDriver.java index 761dad0..a392d71 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperSshDriver.java @@ -20,9 +20,8 @@ package org.apache.brooklyn.entity.messaging.kafka; import java.util.Map; -import brooklyn.entity.basic.Attributes; - import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap;
