Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3681018019 for ; Mon, 17 Aug 2015 22:00:16 +0000 (UTC) Received: (qmail 81686 invoked by uid 500); 17 Aug 2015 22:00:16 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 81662 invoked by uid 500); 17 Aug 2015 22:00:16 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 81653 invoked by uid 99); 17 Aug 2015 22:00:16 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Aug 2015 22:00:16 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 919D71AA39B for ; Mon, 17 Aug 2015 22:00:15 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.774 X-Spam-Level: * X-Spam-Status: No, score=1.774 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.006] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id z6O3xRA9K7Bs for ; Mon, 17 Aug 2015 22:00:08 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id E731B428E7 for ; Mon, 17 Aug 2015 22:00:07 +0000 (UTC) Received: (qmail 81472 invoked by uid 99); 17 Aug 2015 22:00:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Aug 2015 22:00:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 47C94E01CA; Mon, 17 Aug 2015 22:00:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aledsage@apache.org To: commits@brooklyn.incubator.apache.org Date: Mon, 17 Aug 2015 22:00:07 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-brooklyn git commit: Fix missing org.apache.brooklyn imports Repository: incubator-brooklyn Updated Branches: refs/heads/master 6eacb3c38 -> 4d0bbce7c Fix missing org.apache.brooklyn imports - In sandbox and in groovy files Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/2de7f8d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/2de7f8d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/2de7f8d5 Branch: refs/heads/master Commit: 2de7f8d5851a73d9397d5ad96de3718b5c6efae5 Parents: 6eacb3c Author: Aled Sage Authored: Mon Aug 17 10:14:32 2015 +0100 Committer: Aled Sage Committed: Mon Aug 17 22:48:35 2015 +0100 ---------------------------------------------------------------------- .../demo/WebClusterDatabaseExampleGroovy.groovy | 6 +++--- .../brooklyn/entity/database/derby/DerbyDatabase.java | 4 ++-- .../entity/database/derby/DerbyDatabaseSshDriver.java | 4 ++-- .../brooklyn/entity/database/derby/DerbySchema.java | 8 ++++---- .../database/postgresql/PostgreSqlNodeSaltImpl.java | 12 ++++++------ .../org/apache/brooklyn/entity/salt/SaltConfig.java | 11 ++++++----- .../org/apache/brooklyn/entity/salt/SaltConfigs.java | 4 ++-- .../entity/salt/SaltLifecycleEffectorTasks.java | 8 ++++---- .../apache/brooklyn/entity/salt/SaltStackMaster.java | 9 +++++---- .../brooklyn/entity/salt/SaltStackMasterSshDriver.java | 5 +++-- .../org/apache/brooklyn/entity/salt/SaltTasks.java | 13 +++++++------ .../database/postgresql/PostgreSqlSaltLiveTest.java | 11 ++++++----- .../apache/brooklyn/entity/salt/SaltConfigsTest.java | 2 +- .../brooklyn/entity/salt/SaltLiveTestSupport.java | 8 ++++---- .../brooklyn/entity/monitoring/zabbix/ZabbixFeed.java | 4 ++-- .../entity/monitoring/zabbix/ZabbixMonitored.java | 2 +- .../entity/monitoring/zabbix/ZabbixPollConfig.java | 2 +- .../entity/monitoring/zabbix/ZabbixServer.java | 2 +- .../entity/nosql/hazelcast/HazelcastCluster.java | 9 +++++---- .../entity/nosql/hazelcast/HazelcastClusterImpl.java | 8 ++++---- .../brooklyn/entity/nosql/hazelcast/HazelcastNode.java | 9 +++++---- .../entity/nosql/hazelcast/HazelcastNodeImpl.java | 2 +- .../entity/nosql/hazelcast/HazelcastNodeSshDriver.java | 6 +++--- .../entity/nosql/infinispan/Infinispan5Server.java | 4 ++-- .../entity/nosql/infinispan/Infinispan5SshDriver.java | 4 ++-- .../nosql/hazelcast/HazelcastClusterEc2LiveTest.java | 4 ++-- .../hazelcast/HazelcastClusterSoftlayerLiveTest.java | 4 ++-- .../infinispan/Infinispan5ServerIntegrationTest.groovy | 6 +++--- 28 files changed, 89 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy index bcd4903..9f965b9 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy @@ -29,9 +29,9 @@ import org.slf4j.LoggerFactory import brooklyn.entity.basic.AbstractApplication import brooklyn.entity.basic.Entities import brooklyn.entity.database.mysql.MySqlNode -import brooklyn.entity.proxying.EntitySpec -import brooklyn.entity.webapp.ControlledDynamicWebAppCluster -import brooklyn.entity.webapp.DynamicWebAppCluster +import org.apache.brooklyn.api.entity.proxying.EntitySpec +import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster +import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster import brooklyn.policy.autoscaling.AutoScalerPolicy import brooklyn.util.CommandLineUtil http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 00b0ab2..b6c09f8 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,13 +23,14 @@ import java.util.Map; import javax.management.ObjectName; +import org.apache.brooklyn.core.util.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 brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.basic.SoftwareProcessImpl; @@ -40,7 +41,6 @@ import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.event.feed.jmx.JmxHelper; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.SetFromFlag; import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 32bc58c..67ac62b 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 @@ -24,8 +24,8 @@ import java.util.List; import java.util.Map; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; -import brooklyn.location.Location; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.ssh.BashCommands; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 c4fb2b1..99a89fb 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 @@ -25,20 +25,20 @@ import java.util.concurrent.TimeUnit; import javax.management.ObjectName; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.entity.database.Schema; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; import brooklyn.entity.basic.AbstractEntity; -import brooklyn.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import brooklyn.entity.java.UsesJmx; -import brooklyn.event.AttributeSensor; +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 brooklyn.util.flags.SetFromFlag; import com.google.common.base.Objects.ToStringHelper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 e394187..2fa16fc 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 @@ -18,15 +18,20 @@ */ 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.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.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; +import org.apache.brooklyn.api.entity.Effector; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EffectorStartableImpl; import brooklyn.entity.basic.Entities; @@ -38,12 +43,7 @@ import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.basic.DependentConfiguration; import brooklyn.event.feed.ssh.SshFeed; import brooklyn.event.feed.ssh.SshPollConfig; -import brooklyn.location.Location; -import brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.ResourceUtils; -import brooklyn.util.config.ConfigBag; import brooklyn.util.ssh.BashCommands; -import brooklyn.util.task.DynamicTasks; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 3b5962f..5a8330f 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 @@ -18,17 +18,18 @@ */ 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 brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.MapConfigKey; import brooklyn.event.basic.SetConfigKey; -import brooklyn.management.TaskAdaptable; -import brooklyn.management.TaskFactory; -import brooklyn.util.flags.SetFromFlag; import com.google.common.annotations.Beta; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 1622d85..9c97742 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 @@ -21,9 +21,9 @@ package org.apache.brooklyn.entity.salt; import java.util.Map; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import brooklyn.event.basic.MapConfigKey.MapModifications; import brooklyn.event.basic.SetConfigKey.SetModifications; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 7005db9..2d0dbf2 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 @@ -18,20 +18,20 @@ */ package org.apache.brooklyn.entity.salt; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynServerConfig; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.software.MachineLifecycleEffectorTasks; import brooklyn.entity.software.SshEffectorTasks; -import brooklyn.location.MachineLocation; import brooklyn.util.net.Urls; import brooklyn.util.ssh.BashCommands; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 8ce2e3b..9511a85 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 @@ -20,16 +20,17 @@ package org.apache.brooklyn.entity.salt; import java.util.List; -import org.apache.brooklyn.catalog.Catalog; +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 brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.proxying.ImplementedBy; -import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.util.flags.SetFromFlag; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 4b88acc..e77ddff 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,11 +18,12 @@ */ package org.apache.brooklyn.entity.salt; +import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.core.util.task.DynamicTasks; + import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; -import brooklyn.location.basic.SshMachineLocation; import brooklyn.util.ssh.BashCommands; -import brooklyn.util.task.DynamicTasks; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 5cec099..8a3ccc1 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 @@ -26,18 +26,19 @@ import static brooklyn.util.ssh.BashCommands.sudo; import java.util.Map; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.management.TaskFactory; +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.basic.Entities; import brooklyn.entity.effector.EffectorTasks; import brooklyn.entity.software.SshEffectorTasks; -import brooklyn.management.TaskFactory; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Urls; import brooklyn.util.ssh.BashCommands; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; -import brooklyn.util.text.TemplateProcessor; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 250cc03..fde60cc 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,9 +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.location.PortRange; +import org.apache.brooklyn.core.util.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.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -34,12 +40,7 @@ import brooklyn.entity.database.VogellaExampleAccess; import brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import brooklyn.entity.database.postgresql.PostgreSqlNode; import brooklyn.entity.effector.EffectorTasks; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.software.SshEffectorTasks; -import brooklyn.location.PortRange; -import brooklyn.location.basic.PortRanges; -import brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.time.Duration; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 cf1a800..c76e1e6 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 @@ -29,7 +29,7 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.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/2de7f8d5/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 8fbc14f..4e69bde 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 @@ -23,10 +23,10 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import brooklyn.entity.BrooklynAppLiveTestSupport; -import brooklyn.location.Location; -import brooklyn.location.MachineProvisioningLocation; -import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.ManagementContext; +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; public class SaltLiveTestSupport extends BrooklynAppLiveTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java index 5888962..f1e5ae1 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java @@ -33,6 +33,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.core.util.http.HttpTool; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.basic.SupportsPortForwarding; import org.apache.http.client.HttpClient; @@ -66,8 +68,6 @@ import brooklyn.event.feed.AttributePollHandler; import brooklyn.event.feed.PollHandler; import brooklyn.event.feed.Poller; import brooklyn.event.feed.http.HttpValueFunctions; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpToolResponse; import brooklyn.util.net.Cidr; public class ZabbixFeed extends AbstractFeed { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java index e05731e..3104ca3 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java @@ -19,12 +19,12 @@ package org.apache.brooklyn.entity.monitoring.zabbix; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.util.flags.SetFromFlag; public interface ZabbixMonitored { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java index 3906b01..7b2a911 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java @@ -21,6 +21,7 @@ package org.apache.brooklyn.entity.monitoring.zabbix; import javax.annotation.Nullable; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -30,7 +31,6 @@ import brooklyn.event.feed.PollConfig; import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.event.feed.http.JsonFunctions; import brooklyn.util.collections.MutableList; -import brooklyn.util.http.HttpToolResponse; public class ZabbixPollConfig extends PollConfig> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java index e4c92bc..ad4f415 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java @@ -21,6 +21,7 @@ package org.apache.brooklyn.entity.monitoring.zabbix; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -28,7 +29,6 @@ import com.google.common.base.Predicates; import brooklyn.config.ConfigKey; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.flags.SetFromFlag; @ImplementedBy(ZabbixServerImpl.class) public interface ZabbixServer extends Entity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 ef4894f..26e529f 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 @@ -22,15 +22,16 @@ import java.util.List; import com.google.common.reflect.TypeToken; -import org.apache.brooklyn.catalog.Catalog; +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 brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.ImplementedBy; -import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; -import brooklyn.util.flags.SetFromFlag; /** * A cluster of {@link HazelcastNode}s based on {@link DynamicCluster}. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 4f837d7..0eb6744 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 @@ -26,14 +26,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.DynamicClusterImpl; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.location.Location; -import brooklyn.policy.PolicySpec; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.policy.PolicySpec; import brooklyn.util.text.Strings; public class HazelcastClusterImpl extends DynamicClusterImpl implements HazelcastCluster { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 8f3521c..f8a4eb6 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 @@ -18,18 +18,19 @@ */ package org.apache.brooklyn.entity.nosql.hazelcast; -import org.apache.brooklyn.catalog.Catalog; +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 brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.java.UsesJava; import brooklyn.entity.java.UsesJmx; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.location.basic.PortRanges; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.javalang.JavaClassNames; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 fadfe46..3efc53d 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 @@ -29,7 +29,7 @@ import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.event.feed.http.HttpValueFunctions; -import brooklyn.location.access.BrooklynAccessUtils; +import org.apache.brooklyn.location.access.BrooklynAccessUtils; import brooklyn.util.text.Strings; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 1dea440..157a2b7 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 @@ -26,11 +26,11 @@ import java.util.concurrent.ExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.os.Os; import brooklyn.util.ssh.BashCommands; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 cb1043b..f46f61d 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 @@ -20,11 +20,12 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.basic.SoftwareProcessImpl; @@ -32,7 +33,6 @@ import brooklyn.entity.java.UsesJmx; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.SetFromFlag; /** * An {@link brooklyn.entity.Entity} that represents an Infinispan service http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 1c2d33b..e3e35d4 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 @@ -25,8 +25,8 @@ import java.util.List; import java.util.Map; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; -import brooklyn.location.Location; -import brooklyn.location.basic.SshMachineLocation; +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; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 0afb49b..8cd90c9 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 @@ -27,8 +27,8 @@ import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.basic.Attributes; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.location.Location; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 7e05c74..f251c23 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 @@ -27,8 +27,8 @@ import org.testng.annotations.Test; import brooklyn.entity.AbstractSoftlayerLiveTest; import brooklyn.entity.basic.Attributes; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.location.Location; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2de7f8d5/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 1287e2a..5205a74 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 @@ -31,10 +31,10 @@ import org.testng.annotations.AfterMethod import org.testng.annotations.BeforeMethod import org.testng.annotations.Test -import brooklyn.entity.Application +import org.apache.brooklyn.api.entity.Application import brooklyn.entity.basic.Entities -import brooklyn.location.basic.LocalhostMachineProvisioningLocation -import brooklyn.test.entity.TestApplicationImpl +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