Fix imports in sandbox Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/33abfc15 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/33abfc15 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/33abfc15
Branch: refs/heads/master Commit: 33abfc155ac0ba89bd86933625f8ab07d7d0e841 Parents: c27cf1d Author: Aled Sage <[email protected]> Authored: Wed Aug 19 16:33:22 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Wed Aug 19 16:33:22 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/entity/database/Database.groovy | 2 +- .../entity/database/derby/DerbyDatabase.java | 18 +++++------ .../database/derby/DerbyDatabaseDriver.java | 2 +- .../database/derby/DerbyDatabaseSshDriver.java | 8 ++--- .../entity/database/derby/DerbySchema.java | 20 ++++++------ .../postgresql/PostgreSqlNodeSaltImpl.java | 26 ++++++++-------- .../brooklyn/entity/salt/SaltBashCommands.java | 9 +++--- .../apache/brooklyn/entity/salt/SaltConfig.java | 18 +++++------ .../brooklyn/entity/salt/SaltConfigs.java | 9 +++--- .../entity/salt/SaltLifecycleEffectorTasks.java | 18 +++++------ .../brooklyn/entity/salt/SaltStackMaster.java | 12 ++++---- .../entity/salt/SaltStackMasterImpl.java | 2 +- .../entity/salt/SaltStackMasterSshDriver.java | 8 ++--- .../apache/brooklyn/entity/salt/SaltTasks.java | 32 ++++++++++---------- .../postgresql/PostgreSqlSaltLiveTest.java | 14 ++++----- .../brooklyn/entity/salt/SaltConfigsTest.java | 2 +- .../entity/salt/SaltLiveTestSupport.java | 6 ++-- .../nosql/hazelcast/HazelcastCluster.java | 14 ++++----- .../nosql/hazelcast/HazelcastClusterImpl.java | 9 +++--- .../entity/nosql/hazelcast/HazelcastNode.java | 20 ++++++------ .../nosql/hazelcast/HazelcastNodeImpl.java | 8 ++--- .../nosql/hazelcast/HazelcastNodeSshDriver.java | 12 ++++---- .../nosql/infinispan/Infinispan5Server.java | 12 ++++---- .../nosql/infinispan/Infinispan5SshDriver.java | 10 +++--- .../hazelcast/HazelcastClusterEc2LiveTest.java | 4 +-- .../HazelcastClusterSoftlayerLiveTest.java | 4 +-- .../Infinispan5ServerIntegrationTest.groovy | 12 ++++---- 27 files changed, 154 insertions(+), 157 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/Database.groovy ---------------------------------------------------------------------- diff --git a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/Database.groovy b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/Database.groovy index 5118dd0..4e0ce53 100644 --- a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/Database.groovy +++ b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/Database.groovy @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.database -import brooklyn.event.basic.BasicConfigKey +import org.apache.brooklyn.core.config.BasicConfigKey /** * Intended to represent a SQL relational database service. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java ---------------------------------------------------------------------- diff --git a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java index bf9c70b..e9e3b6a 100644 --- a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java +++ b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java @@ -23,24 +23,24 @@ import java.util.Map; import javax.management.ObjectName; -import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.entity.database.Database; import org.apache.brooklyn.entity.database.Schema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; -import brooklyn.entity.java.UsesJava; -import brooklyn.entity.java.UsesJmx; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.BasicConfigKey; -import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.event.feed.jmx.JmxHelper; -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.entity.java.UsesJava; +import org.apache.brooklyn.entity.java.UsesJmx; +import org.apache.brooklyn.core.config.BasicConfigKey; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.feed.jmx.JmxHelper; +import org.apache.brooklyn.util.collections.MutableMap; import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabaseDriver.java ---------------------------------------------------------------------- diff --git a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabaseDriver.java b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabaseDriver.java index 832c2b0..b8594be 100644 --- a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabaseDriver.java +++ b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabaseDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.database.derby; -import brooklyn.entity.java.JavaSoftwareProcessDriver; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessDriver; public interface DerbyDatabaseDriver extends JavaSoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabaseSshDriver.java ---------------------------------------------------------------------- diff --git a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabaseSshDriver.java b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabaseSshDriver.java index 67ac62b..05a1b46 100644 --- a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabaseSshDriver.java +++ b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabaseSshDriver.java @@ -23,11 +23,11 @@ import static java.lang.String.format; import java.util.List; import java.util.Map; -import brooklyn.entity.java.JavaSoftwareProcessSshDriver; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; import org.apache.brooklyn.api.location.Location; -import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.location.ssh.SshMachineLocation; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.ssh.BashCommands; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java ---------------------------------------------------------------------- diff --git a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java index adc31ab..5b9c7eb 100644 --- a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java +++ b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java @@ -26,19 +26,19 @@ import java.util.concurrent.TimeUnit; import javax.management.ObjectName; import org.apache.brooklyn.core.entity.AbstractEntity; -import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.entity.database.Schema; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.basic.EntityLocal; -import brooklyn.entity.java.UsesJmx; -import org.apache.brooklyn.api.event.AttributeSensor; -import brooklyn.event.basic.BasicAttributeSensor; -import brooklyn.event.feed.jmx.JmxAttributePollConfig; -import brooklyn.event.feed.jmx.JmxFeed; -import brooklyn.event.feed.jmx.JmxHelper; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.api.entity.EntityLocal; +import org.apache.brooklyn.entity.java.UsesJmx; +import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.sensor.core.BasicAttributeSensor; +import org.apache.brooklyn.sensor.feed.jmx.JmxAttributePollConfig; +import org.apache.brooklyn.sensor.feed.jmx.JmxFeed; +import org.apache.brooklyn.sensor.feed.jmx.JmxHelper; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; import com.google.common.base.Objects.ToStringHelper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java index 1470c80..9fd0eee 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java @@ -19,31 +19,31 @@ package org.apache.brooklyn.entity.database.postgresql; import org.apache.brooklyn.api.location.Location; -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.util.core.ResourceUtils; +import org.apache.brooklyn.util.core.config.ConfigBag; +import org.apache.brooklyn.util.core.task.DynamicTasks; import org.apache.brooklyn.entity.salt.SaltConfig; import org.apache.brooklyn.entity.salt.SaltConfigs; import org.apache.brooklyn.entity.salt.SaltLifecycleEffectorTasks; -import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.api.effector.Effector; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.entity.stock.EffectorStartableImpl; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode; -import brooklyn.entity.effector.EffectorBody; -import brooklyn.entity.effector.Effectors; -import brooklyn.entity.software.SshEffectorTasks; -import brooklyn.event.basic.DependentConfiguration; -import brooklyn.event.feed.ssh.SshFeed; -import brooklyn.event.feed.ssh.SshPollConfig; -import brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.effector.core.EffectorBody; +import org.apache.brooklyn.effector.core.Effectors; +import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; +import org.apache.brooklyn.sensor.core.DependentConfiguration; +import org.apache.brooklyn.sensor.feed.ssh.SshFeed; +import org.apache.brooklyn.sensor.feed.ssh.SshPollConfig; +import org.apache.brooklyn.util.ssh.BashCommands; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltBashCommands.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltBashCommands.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltBashCommands.java index a9a07bf..7b06a1e 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltBashCommands.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltBashCommands.java @@ -18,16 +18,15 @@ */ package org.apache.brooklyn.entity.salt; -import static brooklyn.util.ssh.BashCommands.downloadToStdout; +import static org.apache.brooklyn.util.ssh.BashCommands.downloadToStdout; import javax.annotation.Nullable; import org.apache.commons.io.FilenameUtils; -import brooklyn.entity.chef.ChefBashCommands; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; import com.google.common.annotations.Beta; import com.google.common.io.Files; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfig.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfig.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfig.java index d229fcc..cebded8 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfig.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfig.java @@ -19,17 +19,17 @@ package org.apache.brooklyn.entity.salt; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.event.AttributeSensor; -import org.apache.brooklyn.api.management.TaskAdaptable; -import org.apache.brooklyn.api.management.TaskFactory; -import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.api.mgmt.TaskAdaptable; +import org.apache.brooklyn.api.mgmt.TaskFactory; +import org.apache.brooklyn.util.core.flags.SetFromFlag; -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import brooklyn.event.basic.BasicAttributeSensor; -import brooklyn.event.basic.BasicConfigKey; -import brooklyn.event.basic.MapConfigKey; -import brooklyn.event.basic.SetConfigKey; +import org.apache.brooklyn.sensor.core.BasicAttributeSensor; +import org.apache.brooklyn.core.config.BasicConfigKey; +import org.apache.brooklyn.core.config.MapConfigKey; +import org.apache.brooklyn.core.config.SetConfigKey; import com.google.common.annotations.Beta; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfigs.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfigs.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfigs.java index 58ac78e..bfa98cb 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfigs.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfigs.java @@ -20,14 +20,13 @@ package org.apache.brooklyn.entity.salt; import java.util.Map; -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; 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.core.config.MapConfigKey.MapModifications; +import org.apache.brooklyn.core.config.SetConfigKey.SetModifications; import org.apache.brooklyn.core.entity.EntityInternal; -import brooklyn.event.basic.MapConfigKey.MapModifications; -import brooklyn.event.basic.SetConfigKey.SetModifications; - import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java index 18fe929..09409dc 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java @@ -22,18 +22,18 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; -import org.apache.brooklyn.core.util.task.DynamicTasks; -import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.core.server.BrooklynServerConfig; +import org.apache.brooklyn.entity.software.base.lifecycle.MachineLifecycleEffectorTasks; +import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; +import org.apache.brooklyn.util.core.task.DynamicTasks; +import org.apache.brooklyn.util.core.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.BrooklynServerConfig; -import brooklyn.entity.software.MachineLifecycleEffectorTasks; -import brooklyn.entity.software.SshEffectorTasks; -import brooklyn.util.net.Urls; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import com.google.common.annotations.Beta; import com.google.common.base.Supplier; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java index ad166b3..a90b836 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java @@ -21,17 +21,17 @@ package org.apache.brooklyn.entity.salt; import java.util.List; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.api.event.AttributeSensor; -import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.api.entity.ImplementedBy; +import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.core.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.BrooklynConfigKeys; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import brooklyn.event.basic.BasicAttributeSensor; -import brooklyn.event.basic.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.BasicAttributeSensor; +import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterImpl.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterImpl.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterImpl.java index 36cbc65..8c2a3af 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterImpl.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterImpl.java @@ -22,7 +22,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; -import brooklyn.event.feed.ConfigToAttributes; +import org.apache.brooklyn.sensor.feed.ConfigToAttributes; public class SaltStackMasterImpl extends SoftwareProcessImpl implements SaltStackMaster { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterSshDriver.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterSshDriver.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterSshDriver.java index c0afb08..6010484 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterSshDriver.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterSshDriver.java @@ -18,12 +18,12 @@ */ package org.apache.brooklyn.entity.salt; -import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.core.entity.Entities; -import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.util.core.task.DynamicTasks; -import brooklyn.entity.java.JavaSoftwareProcessSshDriver; -import brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; +import org.apache.brooklyn.util.ssh.BashCommands; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java index 41bf452..510f9a2 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java @@ -18,27 +18,27 @@ */ package org.apache.brooklyn.entity.salt; -import static brooklyn.util.ssh.BashCommands.INSTALL_CURL; -import static brooklyn.util.ssh.BashCommands.INSTALL_TAR; -import static brooklyn.util.ssh.BashCommands.INSTALL_UNZIP; -import static brooklyn.util.ssh.BashCommands.downloadToStdout; -import static brooklyn.util.ssh.BashCommands.sudo; +import static org.apache.brooklyn.util.ssh.BashCommands.INSTALL_CURL; +import static org.apache.brooklyn.util.ssh.BashCommands.INSTALL_TAR; +import static org.apache.brooklyn.util.ssh.BashCommands.INSTALL_UNZIP; +import static org.apache.brooklyn.util.ssh.BashCommands.downloadToStdout; +import static org.apache.brooklyn.util.ssh.BashCommands.sudo; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.management.TaskFactory; +import org.apache.brooklyn.api.mgmt.TaskFactory; import org.apache.brooklyn.core.entity.Entities; -import org.apache.brooklyn.core.util.ResourceUtils; -import org.apache.brooklyn.core.util.task.DynamicTasks; -import org.apache.brooklyn.core.util.task.Tasks; -import org.apache.brooklyn.core.util.text.TemplateProcessor; - -import brooklyn.entity.effector.EffectorTasks; -import brooklyn.entity.software.SshEffectorTasks; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Urls; -import brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.core.ResourceUtils; +import org.apache.brooklyn.util.core.task.DynamicTasks; +import org.apache.brooklyn.util.core.task.Tasks; +import org.apache.brooklyn.util.core.text.TemplateProcessor; + +import org.apache.brooklyn.effector.core.EffectorTasks; +import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.ssh.BashCommands; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java b/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java index fee43ae..c646670 100644 --- a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java +++ b/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java @@ -20,15 +20,15 @@ package org.apache.brooklyn.entity.database.postgresql; import java.util.Random; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.core.entity.Entities; -import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; +import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNodeSaltImpl; import org.apache.brooklyn.entity.salt.SaltConfig; import org.apache.brooklyn.entity.salt.SaltLiveTestSupport; -import org.apache.brooklyn.location.basic.PortRanges; -import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.core.PortRanges; +import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,9 +38,9 @@ import org.testng.annotations.Test; import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode; -import brooklyn.entity.effector.EffectorTasks; -import brooklyn.entity.software.SshEffectorTasks; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.effector.core.EffectorTasks; +import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; +import org.apache.brooklyn.util.time.Duration; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltConfigsTest.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltConfigsTest.java b/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltConfigsTest.java index ae07f74..0bbbbcd 100644 --- a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltConfigsTest.java +++ b/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltConfigsTest.java @@ -28,7 +28,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; -import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.core.test.entity.TestApplication; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltLiveTestSupport.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltLiveTestSupport.java b/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltLiveTestSupport.java index 4e69bde..13f1b34 100644 --- a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltLiveTestSupport.java +++ b/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltLiveTestSupport.java @@ -22,11 +22,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; -import brooklyn.entity.BrooklynAppLiveTestSupport; +import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.MachineProvisioningLocation; -import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.api.mgmt.ManagementContext; +import org.apache.brooklyn.location.ssh.SshMachineLocation; public class SaltLiveTestSupport extends BrooklynAppLiveTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java index 656faf6..d64cd3c 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java @@ -23,15 +23,15 @@ import java.util.List; import com.google.common.reflect.TypeToken; 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.core.util.flags.SetFromFlag; +import org.apache.brooklyn.api.entity.ImplementedBy; +import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.util.core.flags.SetFromFlag; -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import brooklyn.entity.group.DynamicCluster; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.Sensors; +import org.apache.brooklyn.entity.group.DynamicCluster; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.Sensors; /** * A cluster of {@link HazelcastNode}s based on {@link DynamicCluster}. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java index d300ceb..9b735ee 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java @@ -28,15 +28,14 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; import org.apache.brooklyn.api.entity.Entity; -import brooklyn.entity.group.AbstractMembershipTrackingPolicy; -import brooklyn.entity.group.DynamicClusterImpl; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; +import org.apache.brooklyn.entity.group.DynamicClusterImpl; +import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.EntityInternal; - -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.Strings; public class HazelcastClusterImpl extends DynamicClusterImpl implements HazelcastCluster { private static final Logger LOG = LoggerFactory.getLogger(HazelcastClusterImpl.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java index c9d2df5..60df1fa 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java @@ -19,19 +19,19 @@ package org.apache.brooklyn.entity.nosql.hazelcast; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.core.util.flags.SetFromFlag; -import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.api.entity.ImplementedBy; +import org.apache.brooklyn.util.core.flags.SetFromFlag; +import org.apache.brooklyn.location.core.PortRanges; -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import brooklyn.entity.java.UsesJava; -import brooklyn.entity.java.UsesJmx; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; -import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.entity.java.UsesJava; +import org.apache.brooklyn.entity.java.UsesJmx; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.util.javalang.JavaClassNames; /** * An {@link brooklyn.entity.Entity} that represents an Hazelcast node http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java index 811f1b9..36fd1be 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java @@ -25,11 +25,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; -import brooklyn.event.feed.http.HttpFeed; -import brooklyn.event.feed.http.HttpPollConfig; -import brooklyn.event.feed.http.HttpValueFunctions; +import org.apache.brooklyn.sensor.feed.http.HttpFeed; +import org.apache.brooklyn.sensor.feed.http.HttpPollConfig; +import org.apache.brooklyn.sensor.feed.http.HttpValueFunctions; import org.apache.brooklyn.location.access.BrooklynAccessUtils; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Functions; import com.google.common.net.HostAndPort; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java index d35513b..3b664fe 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java @@ -27,14 +27,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.core.entity.Entities; -import brooklyn.entity.java.JavaSoftwareProcessSshDriver; -import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.os.Os; -import brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; +import org.apache.brooklyn.location.ssh.SshMachineLocation; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5Server.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5Server.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5Server.java index 1320fdc..7d62229 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5Server.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5Server.java @@ -21,18 +21,18 @@ package org.apache.brooklyn.entity.nosql.infinispan; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; -import brooklyn.entity.java.UsesJmx; -import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.entity.java.UsesJmx; +import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; +import org.apache.brooklyn.util.collections.MutableMap; /** * An {@link brooklyn.entity.Entity} that represents an Infinispan service http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5SshDriver.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5SshDriver.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5SshDriver.java index e3e35d4..87f25c1 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5SshDriver.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5SshDriver.java @@ -24,12 +24,12 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import brooklyn.entity.java.JavaSoftwareProcessSshDriver; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; import org.apache.brooklyn.api.location.Location; -import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; -import brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.location.ssh.SshMachineLocation; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.ssh.BashCommands; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java index 6f944b5..f1d44fc 100644 --- a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java +++ b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java @@ -25,9 +25,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import brooklyn.entity.AbstractEc2LiveTest; +import org.apache.brooklyn.entity.AbstractEc2LiveTest; -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.entity.Attributes; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java index 1538822..0e9fe0b 100644 --- a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java +++ b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java @@ -25,9 +25,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import brooklyn.entity.AbstractSoftlayerLiveTest; +import org.apache.brooklyn.entity.AbstractSoftlayerLiveTest; -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.entity.Attributes; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33abfc15/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy index 2bfb9ab..a69121c 100644 --- a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy +++ b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy @@ -32,12 +32,12 @@ import org.testng.annotations.BeforeMethod import org.testng.annotations.Test import org.apache.brooklyn.api.entity.Application -import org.apache.brooklyn.entity.core.Entities -import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation -import org.apache.brooklyn.test.entity.TestApplicationImpl -import brooklyn.util.internal.TimeExtras -import brooklyn.util.net.Networking -import brooklyn.util.repeat.Repeater +import org.apache.brooklyn.core.entity.Entities +import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation +import org.apache.brooklyn.core.test.entity.TestApplicationImpl +import org.apache.brooklyn.util.internal.TimeExtras +import org.apache.brooklyn.util.net.Networking +import org.apache.brooklyn.util.repeat.Repeater class Infinispan5ServerIntegrationTest { private static final Logger logger = LoggerFactory.getLogger(Infinispan5ServerIntegrationTest.class)
