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 D89C11870D for ; Tue, 18 Aug 2015 11:00:36 +0000 (UTC) Received: (qmail 71073 invoked by uid 500); 18 Aug 2015 11:00:36 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 71050 invoked by uid 500); 18 Aug 2015 11:00:36 -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 71041 invoked by uid 99); 18 Aug 2015 11:00:36 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Aug 2015 11:00:36 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 23730C0992 for ; Tue, 18 Aug 2015 11:00:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-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-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id 3dNpwYDdVaL5 for ; Tue, 18 Aug 2015 11:00:19 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 27C4920F4F for ; Tue, 18 Aug 2015 11:00:17 +0000 (UTC) Received: (qmail 68768 invoked by uid 99); 18 Aug 2015 11:00:16 -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; Tue, 18 Aug 2015 11:00:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 450E7DFF6A; Tue, 18 Aug 2015 11:00:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.incubator.apache.org Date: Tue, 18 Aug 2015 11:00:19 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/64] incubator-brooklyn git commit: [BROOKLYN-162] Refactor package in ./core/util http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java b/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java index 6cde4d3..04048af 100644 --- a/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java +++ b/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java @@ -27,6 +27,12 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.trait.HasShortName; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.policy.Enricher; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.core.util.task.ssh.SshPutTaskWrapper; +import org.apache.brooklyn.core.util.task.ssh.SshTasks; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; +import org.apache.brooklyn.core.util.text.TemplateProcessor; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; @@ -38,15 +44,9 @@ import brooklyn.entity.effector.EffectorTasks; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.cloud.names.AbstractCloudMachineNamer; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.os.Os; import brooklyn.util.ssh.BashCommands; -import brooklyn.util.task.Tasks; -import brooklyn.util.task.ssh.SshPutTaskWrapper; -import brooklyn.util.task.ssh.SshTasks; -import brooklyn.util.task.system.ProcessTaskWrapper; -import brooklyn.util.text.TemplateProcessor; public class InitdServiceInstaller implements SystemServiceInstaller { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java b/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java index 7c4ada5..bbad039 100644 --- a/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java +++ b/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java @@ -25,6 +25,13 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.management.ExecutionContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.policy.Enricher; +import org.apache.brooklyn.core.util.task.BasicExecutionManager; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.TaskBuilder; +import org.apache.brooklyn.core.util.task.ssh.SshPutTaskWrapper; +import org.apache.brooklyn.core.util.task.ssh.SshTasks; +import org.apache.brooklyn.core.util.task.system.ProcessTaskFactory; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; @@ -39,13 +46,6 @@ import brooklyn.entity.effector.EffectorTasks; import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.net.Urls; -import brooklyn.util.task.BasicExecutionManager; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.TaskBuilder; -import brooklyn.util.task.ssh.SshPutTaskWrapper; -import brooklyn.util.task.ssh.SshTasks; -import brooklyn.util.task.system.ProcessTaskFactory; -import brooklyn.util.task.system.ProcessTaskWrapper; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java b/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java index 2e68f6f..3173aa4 100644 --- a/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java +++ b/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java @@ -22,6 +22,9 @@ import java.util.List; import java.util.concurrent.Callable; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.core.util.task.ssh.SshTasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,15 +35,14 @@ import com.google.common.collect.Lists; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.EntityInternal; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.net.Protocol; import brooklyn.util.ssh.BashCommands; import brooklyn.util.ssh.IptablesCommands; import brooklyn.util.ssh.IptablesCommands.Chain; import brooklyn.util.ssh.IptablesCommands.Policy; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; -import brooklyn.util.task.ssh.SshTasks; import brooklyn.util.text.Strings; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java index 97add55..34cd86e 100644 --- a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java @@ -37,6 +37,10 @@ import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.location.MachineManagementMixins.SuspendsMachines; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -77,15 +81,11 @@ import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.cloud.CloudLocationConfig; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe; import brooklyn.util.net.UserAndHostAndPort; import brooklyn.util.os.Os; import brooklyn.util.ssh.BashCommands; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; -import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.text.Strings; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/main/java/brooklyn/entity/software/ProvidesProvisioningFlags.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/ProvidesProvisioningFlags.java b/software/base/src/main/java/brooklyn/entity/software/ProvidesProvisioningFlags.java index 91c6666..8052ece 100644 --- a/software/base/src/main/java/brooklyn/entity/software/ProvidesProvisioningFlags.java +++ b/software/base/src/main/java/brooklyn/entity/software/ProvidesProvisioningFlags.java @@ -19,8 +19,7 @@ package brooklyn.entity.software; import org.apache.brooklyn.api.location.MachineProvisioningLocation; - -import brooklyn.util.config.ConfigBag; +import org.apache.brooklyn.core.util.config.ConfigBag; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java index e40170c..f5ca922 100644 --- a/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java @@ -27,6 +27,18 @@ import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; +import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.core.util.task.ssh.SshFetchTaskFactory; +import org.apache.brooklyn.core.util.task.ssh.SshFetchTaskWrapper; +import org.apache.brooklyn.core.util.task.ssh.SshPutTaskFactory; +import org.apache.brooklyn.core.util.task.ssh.SshPutTaskWrapper; +import org.apache.brooklyn.core.util.task.ssh.SshTasks; +import org.apache.brooklyn.core.util.task.ssh.internal.AbstractSshExecTaskFactory; +import org.apache.brooklyn.core.util.task.ssh.internal.PlainSshExecTaskFactory; +import org.apache.brooklyn.core.util.task.system.ProcessTaskFactory; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,19 +56,7 @@ import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory; import org.apache.brooklyn.location.basic.LocationInternal; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.ssh.BashCommands; -import brooklyn.util.task.Tasks; -import brooklyn.util.task.ssh.SshFetchTaskFactory; -import brooklyn.util.task.ssh.SshFetchTaskWrapper; -import brooklyn.util.task.ssh.SshPutTaskFactory; -import brooklyn.util.task.ssh.SshPutTaskWrapper; -import brooklyn.util.task.ssh.SshTasks; -import brooklyn.util.task.ssh.internal.AbstractSshExecTaskFactory; -import brooklyn.util.task.ssh.internal.PlainSshExecTaskFactory; -import brooklyn.util.task.system.ProcessTaskFactory; -import brooklyn.util.task.system.ProcessTaskWrapper; import com.google.common.annotations.Beta; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/main/java/brooklyn/entity/software/StaticSensor.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/StaticSensor.java b/software/base/src/main/java/brooklyn/entity/software/StaticSensor.java index a0c1b82..b0d8881 100644 --- a/software/base/src/main/java/brooklyn/entity/software/StaticSensor.java +++ b/software/base/src/main/java/brooklyn/entity/software/StaticSensor.java @@ -20,6 +20,9 @@ package brooklyn.entity.software; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.core.util.task.ValueResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,10 +30,7 @@ import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.Propagator; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.effector.AddSensor; -import brooklyn.util.config.ConfigBag; import brooklyn.util.guava.Maybe; -import brooklyn.util.task.Tasks; -import brooklyn.util.task.ValueResolver; import com.google.common.base.Supplier; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/main/java/brooklyn/entity/software/http/HttpRequestSensor.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/http/HttpRequestSensor.java b/software/base/src/main/java/brooklyn/entity/software/http/HttpRequestSensor.java index 8d0047a..c9f87a5 100644 --- a/software/base/src/main/java/brooklyn/entity/software/http/HttpRequestSensor.java +++ b/software/base/src/main/java/brooklyn/entity/software/http/HttpRequestSensor.java @@ -23,6 +23,7 @@ import java.net.URI; import net.minidev.json.JSONObject; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +35,6 @@ import brooklyn.entity.software.ssh.SshCommandSensor; import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.event.feed.http.HttpValueFunctions; -import brooklyn.util.config.ConfigBag; import com.google.common.annotations.Beta; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/main/java/brooklyn/entity/software/java/JmxAttributeSensor.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/java/JmxAttributeSensor.java b/software/base/src/main/java/brooklyn/entity/software/java/JmxAttributeSensor.java index b866be3..0802b22 100644 --- a/software/base/src/main/java/brooklyn/entity/software/java/JmxAttributeSensor.java +++ b/software/base/src/main/java/brooklyn/entity/software/java/JmxAttributeSensor.java @@ -25,6 +25,9 @@ import javax.management.ObjectName; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,9 +41,6 @@ import brooklyn.event.basic.DependentConfiguration; import brooklyn.event.feed.jmx.JmxAttributePollConfig; import brooklyn.event.feed.jmx.JmxFeed; import brooklyn.event.feed.jmx.JmxHelper; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; import brooklyn.util.time.Duration; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandEffector.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandEffector.java b/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandEffector.java index ca26baa..8d15270 100644 --- a/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandEffector.java +++ b/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandEffector.java @@ -22,6 +22,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.ParameterType; +import org.apache.brooklyn.core.util.config.ConfigBag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; @@ -33,7 +34,6 @@ import brooklyn.entity.effector.Effectors.EffectorBuilder; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.entity.software.SshEffectorTasks.SshEffectorTaskFactory; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.text.Strings; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandSensor.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandSensor.java b/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandSensor.java index 4443ece..1b6e99b 100644 --- a/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandSensor.java +++ b/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandSensor.java @@ -22,6 +22,8 @@ import java.util.Map; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntityInitializer; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,8 +37,6 @@ import brooklyn.event.feed.ssh.SshFeed; import brooklyn.event.feed.ssh.SshPollConfig; import brooklyn.event.feed.ssh.SshValueFunctions; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.os.Os; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/main/java/brooklyn/entity/software/winrm/WindowsPerformanceCounterSensors.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/winrm/WindowsPerformanceCounterSensors.java b/software/base/src/main/java/brooklyn/entity/software/winrm/WindowsPerformanceCounterSensors.java index 1a3656f..310f855 100644 --- a/software/base/src/main/java/brooklyn/entity/software/winrm/WindowsPerformanceCounterSensors.java +++ b/software/base/src/main/java/brooklyn/entity/software/winrm/WindowsPerformanceCounterSensors.java @@ -23,6 +23,7 @@ import java.util.Set; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntityInitializer; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +32,6 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; import brooklyn.event.basic.Sensors; import brooklyn.event.feed.windows.WindowsPerformanceCounterFeed; -import brooklyn.util.config.ConfigBag; import brooklyn.util.text.Strings; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/main/java/brooklyn/event/feed/jmx/JmxHelper.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/event/feed/jmx/JmxHelper.java b/software/base/src/main/java/brooklyn/event/feed/jmx/JmxHelper.java index c39ca9f..f809d31 100644 --- a/software/base/src/main/java/brooklyn/event/feed/jmx/JmxHelper.java +++ b/software/base/src/main/java/brooklyn/event/feed/jmx/JmxHelper.java @@ -61,12 +61,12 @@ import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.core.util.crypto.SecureKeys; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.java.JmxSupport; import brooklyn.entity.java.UsesJmx; -import brooklyn.util.crypto.SecureKeys; import brooklyn.util.crypto.SslTrustUtils; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.exceptions.RuntimeInterruptedException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java index aa46dd1..ab59e39 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.task.TaskInternal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -44,7 +45,6 @@ import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.test.Asserts; -import brooklyn.util.task.TaskInternal; import brooklyn.util.time.Duration; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java index 7ae7b54..ee9723a 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java @@ -34,6 +34,7 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; @@ -48,8 +49,6 @@ import brooklyn.entity.rebind.RebindTestUtils; import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.flags.SetFromFlag; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.io.Files; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java index 3d8ddda..7a1deb4 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java @@ -40,6 +40,9 @@ import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.management.EntityManager; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskAdaptable; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.jclouds.util.Throwables2; @@ -74,13 +77,10 @@ import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.exceptions.PropagatedRuntimeException; import brooklyn.util.net.UserAndHostAndPort; import brooklyn.util.os.Os; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; import brooklyn.util.text.Strings; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java index f528f7c..aadb1ea 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java @@ -34,6 +34,7 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.BrooklynNetworkUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; import org.testng.annotations.AfterMethod; @@ -45,7 +46,6 @@ import brooklyn.entity.trait.Startable; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.BrooklynNetworkUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.os.Os; import brooklyn.util.stream.KnownSizeInputStream; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java index 8b516ad..f8fb978 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java @@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -33,7 +34,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.SoftwareProcess.ChildStartableMode; -import brooklyn.util.ResourceUtils; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.os.Os; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/basic/lifecycle/MyEntityImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/MyEntityImpl.java b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/MyEntityImpl.java index c8eca43..9f7c290 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/MyEntityImpl.java +++ b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/MyEntityImpl.java @@ -26,11 +26,13 @@ import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.basic.SoftwareProcessDriver; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; + +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.ResourceUtils; + import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.text.Identifiers; public class MyEntityImpl extends SoftwareProcessImpl implements MyEntity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java index 5ab4228..aedc116 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java @@ -26,6 +26,9 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.task.BasicExecutionContext; +import org.apache.brooklyn.core.util.task.BasicExecutionManager; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -39,9 +42,6 @@ import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.repeat.Repeater; -import brooklyn.util.task.BasicExecutionContext; -import brooklyn.util.task.BasicExecutionManager; -import brooklyn.util.task.Tasks; import brooklyn.util.time.Duration; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java index 1ef3e94..83c7dec 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java @@ -31,6 +31,9 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; +import org.apache.brooklyn.core.util.internal.ssh.cli.SshCliTool; +import org.apache.brooklyn.core.util.internal.ssh.sshj.SshjTool; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestApplicationImpl; import org.apache.brooklyn.test.entity.TestEntity; @@ -41,13 +44,12 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.test.Asserts; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableSet; -import brooklyn.util.internal.ssh.SshTool; -import brooklyn.util.internal.ssh.cli.SshCliTool; -import brooklyn.util.internal.ssh.sshj.SshjTool; import brooklyn.util.stream.StreamGobbler; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java index a088996..e473f52 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java @@ -35,6 +35,9 @@ import org.apache.brooklyn.api.entity.Effector; 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.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.http.HttpTool; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.http.auth.UsernamePasswordCredentials; @@ -58,17 +61,16 @@ import brooklyn.entity.brooklynnode.BrooklynNode.ExistingFileBehaviour; import brooklyn.entity.brooklynnode.BrooklynNode.StopNodeAndKillAppsEffector; import brooklyn.entity.proxying.EntityProxyImpl; import brooklyn.event.feed.http.JsonFunctions; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Functionals; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpToolResponse; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.net.Networking; import brooklyn.util.net.Urls; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/brooklynnode/CallbackEntityHttpClient.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/CallbackEntityHttpClient.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/CallbackEntityHttpClient.java index ad5d1f2..e9a73bf 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/CallbackEntityHttpClient.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/CallbackEntityHttpClient.java @@ -23,13 +23,13 @@ import java.util.List; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.core.util.http.HttpToolResponse; +import org.apache.brooklyn.core.util.http.HttpTool.HttpClientBuilder; import org.apache.http.HttpStatus; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import brooklyn.entity.brooklynnode.EntityHttpClient; -import brooklyn.util.http.HttpTool.HttpClientBuilder; -import brooklyn.util.http.HttpToolResponse; import com.google.common.base.Function; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java b/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java index a04d9fa..2b65f58 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java +++ b/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java @@ -25,6 +25,7 @@ import org.apache.brooklyn.api.entity.Entity; 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.core.util.ResourceUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -34,7 +35,6 @@ import brooklyn.entity.basic.EntityInternal; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.ResourceUtils; import brooklyn.util.io.FileUtil; import brooklyn.util.stream.InputStreamSupplier; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java index ff7dfb1..1d175b1 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java @@ -22,6 +22,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +34,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.util.stream.StreamGobbler; -import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverMySqlEntityLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverMySqlEntityLiveTest.java b/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverMySqlEntityLiveTest.java index 941ba0f..75133c7 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverMySqlEntityLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverMySqlEntityLiveTest.java @@ -20,12 +20,12 @@ package brooklyn.entity.chef.mysql; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.software.SshEffectorTasks; -import brooklyn.util.task.system.ProcessTaskWrapper; public class ChefSoloDriverMySqlEntityLiveTest extends AbstractChefToyMySqlEntityLiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java b/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java index b7034e0..f5213d9 100644 --- a/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java @@ -31,6 +31,9 @@ import java.util.Set; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.core.util.internal.ssh.RecordingSshTool; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; +import org.apache.brooklyn.core.util.internal.ssh.RecordingSshTool.ExecCmd; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -44,9 +47,6 @@ import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; -import brooklyn.util.internal.ssh.RecordingSshTool; -import brooklyn.util.internal.ssh.RecordingSshTool.ExecCmd; -import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.jmx.jmxmp.JmxmpAgent; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/java/JmxSupportTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/JmxSupportTest.java b/software/base/src/test/java/brooklyn/entity/java/JmxSupportTest.java index caaf757..97df90b 100644 --- a/software/base/src/test/java/brooklyn/entity/java/JmxSupportTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/JmxSupportTest.java @@ -20,6 +20,8 @@ package brooklyn.entity.java; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,9 +31,7 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.java.UsesJmx.JmxAgentModes; -import brooklyn.util.ResourceUtils; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.maven.MavenRetriever; import brooklyn.util.stream.Streams; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/java/SslKeyConfigTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/SslKeyConfigTest.java b/software/base/src/test/java/brooklyn/entity/java/SslKeyConfigTest.java index 01c2cfb..eab15ca 100644 --- a/software/base/src/test/java/brooklyn/entity/java/SslKeyConfigTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/SslKeyConfigTest.java @@ -24,12 +24,11 @@ import java.security.Key; import java.security.KeyStore; import java.security.cert.Certificate; +import org.apache.brooklyn.core.util.crypto.FluentKeySigner; +import org.apache.brooklyn.core.util.crypto.SecureKeys; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.util.crypto.FluentKeySigner; -import brooklyn.util.crypto.SecureKeys; - public class SslKeyConfigTest { @Test http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java index dd2b9b0..eaabfed 100644 --- a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java @@ -25,6 +25,7 @@ import java.io.File; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -42,7 +43,6 @@ import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java index 73a2675..067f86e 100644 --- a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java @@ -43,6 +43,9 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.crypto.FluentKeySigner; +import org.apache.brooklyn.core.util.crypto.SecureKeys; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,13 +56,12 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; import brooklyn.event.feed.jmx.JmxHelper; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.PortRanges; + import brooklyn.test.Asserts; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; -import brooklyn.util.crypto.FluentKeySigner; -import brooklyn.util.crypto.SecureKeys; import brooklyn.util.crypto.SslTrustUtils; import brooklyn.util.jmx.jmxmp.JmxmpAgent; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java b/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java index 2fcd1df..c143adf 100644 --- a/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java @@ -29,6 +29,7 @@ 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.management.Task; +import org.apache.brooklyn.core.util.task.TaskInternal; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -50,9 +51,10 @@ import brooklyn.entity.basic.SoftwareProcess.StopSoftwareParameters.StopMode; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.DependentConfiguration; import brooklyn.event.basic.Sensors; + import org.apache.brooklyn.location.jclouds.BailOutJcloudsLocation; + import brooklyn.test.Asserts; -import brooklyn.util.task.TaskInternal; import brooklyn.util.time.Duration; public class MachineLifecycleEffectorTasksTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java b/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java index 599b7ac..61389c9 100644 --- a/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java @@ -24,6 +24,8 @@ import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,9 +41,6 @@ import brooklyn.entity.software.SshEffectorTasks.SshEffectorBody; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.task.system.ProcessTaskWrapper; - import com.google.common.base.Throwables; public class SoftwareEffectorTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java b/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java index 8494e36..f0a4364 100644 --- a/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java @@ -26,6 +26,9 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.api.management.TaskFactory; +import org.apache.brooklyn.core.util.task.ssh.SshFetchTaskWrapper; +import org.apache.brooklyn.core.util.task.ssh.SshPutTaskWrapper; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; @@ -42,9 +45,6 @@ import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.exceptions.PropagatedRuntimeException; import brooklyn.util.net.Urls; -import brooklyn.util.task.ssh.SshFetchTaskWrapper; -import brooklyn.util.task.ssh.SshPutTaskWrapper; -import brooklyn.util.task.system.ProcessTaskWrapper; import com.google.common.io.Files; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/software/StaticSensorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/StaticSensorTest.java b/software/base/src/test/java/brooklyn/entity/software/StaticSensorTest.java index 7ec8952..285122d 100644 --- a/software/base/src/test/java/brooklyn/entity/software/StaticSensorTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/StaticSensorTest.java @@ -19,13 +19,13 @@ package brooklyn.entity.software; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.BasicEntity; import brooklyn.event.basic.Sensors; -import brooklyn.util.config.ConfigBag; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java b/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java index eb53f3e..8ae262b 100644 --- a/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java @@ -22,6 +22,7 @@ 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.location.Location; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -34,7 +35,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.event.basic.Sensors; import brooklyn.test.TestHttpRequestHandler; import brooklyn.test.TestHttpServer; -import brooklyn.util.config.ConfigBag; import brooklyn.util.time.Duration; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java b/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java index 98bae62..12266b5 100644 --- a/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.software.mysql; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +39,6 @@ import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; -import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java b/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java index df3e436..8e1ee2e 100644 --- a/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java +++ b/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java @@ -26,6 +26,10 @@ import org.apache.brooklyn.api.entity.proxying.EntityInitializer; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.OsDetails; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.core.util.task.ssh.SshTasks; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,10 +44,6 @@ import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.L import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.ssh.BashCommands; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; -import brooklyn.util.task.ssh.SshTasks; -import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.text.ComparableVersion; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java index 2d142e4..6316d03 100644 --- a/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java @@ -27,6 +27,7 @@ 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.location.Location; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -43,7 +44,6 @@ import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.time.Duration; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/DatastoreMixins.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/DatastoreMixins.java b/software/database/src/main/java/brooklyn/entity/database/DatastoreMixins.java index 90f8a62..4727473 100644 --- a/software/database/src/main/java/brooklyn/entity/database/DatastoreMixins.java +++ b/software/database/src/main/java/brooklyn/entity/database/DatastoreMixins.java @@ -25,13 +25,13 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.effector.Effectors; import brooklyn.event.basic.Sensors; -import brooklyn.util.ResourceUtils; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.stream.KnownSizeInputStream; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/crate/CrateNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/crate/CrateNode.java b/software/database/src/main/java/brooklyn/entity/database/crate/CrateNode.java index 8d5fae3..8373648 100644 --- a/software/database/src/main/java/brooklyn/entity/database/crate/CrateNode.java +++ b/software/database/src/main/java/brooklyn/entity/database/crate/CrateNode.java @@ -20,6 +20,7 @@ package brooklyn.entity.database.crate; 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.Attributes; @@ -33,8 +34,8 @@ import brooklyn.event.basic.AttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; + import org.apache.brooklyn.location.basic.PortRanges; -import brooklyn.util.flags.SetFromFlag; @ImplementedBy(CrateNodeImpl.class) public interface CrateNode extends SoftwareProcess, UsesJava,UsesJmx, UsesJavaMXBeans, DatastoreCommon { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbDriver.java b/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbDriver.java index 3d92173..2db7f2ef4 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbDriver.java +++ b/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbDriver.java @@ -18,8 +18,9 @@ */ package brooklyn.entity.database.mariadb; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; + import brooklyn.entity.basic.SoftwareProcessDriver; -import brooklyn.util.task.system.ProcessTaskWrapper; /** * The {@link SoftwareProcessDriver} for MariaDB. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbNode.java b/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbNode.java index d067625..ab77af5 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbNode.java +++ b/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbNode.java @@ -22,6 +22,7 @@ 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.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; @@ -34,8 +35,8 @@ import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSens import brooklyn.event.basic.MapConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; + import org.apache.brooklyn.location.basic.PortRanges; -import brooklyn.util.flags.SetFromFlag; @Catalog(name="MariaDB Node", description="MariaDB is an open source relational database management system (RDBMS)", iconUrl="classpath:///mariadb-logo-180x119.png") @ImplementedBy(MariaDbNodeImpl.class) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbNodeImpl.java b/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbNodeImpl.java index 0212749..a22af08 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbNodeImpl.java +++ b/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbNodeImpl.java @@ -26,9 +26,11 @@ 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.core.util.config.ConfigBag; import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.config.ConfigBag; + import brooklyn.util.guava.Maybe; import brooklyn.util.text.Identifiers; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbSshDriver.java b/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbSshDriver.java index b35a1cd..4d916b9 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbSshDriver.java +++ b/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbSshDriver.java @@ -41,14 +41,14 @@ import 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.SshMachineLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Urls; import brooklyn.util.os.Os; import brooklyn.util.ssh.BashCommands; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.text.Identifiers; import brooklyn.util.text.Strings; import brooklyn.util.time.CountdownTimer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlClusterImpl.java b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlClusterImpl.java index 683f13b..f86ad43 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlClusterImpl.java +++ b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlClusterImpl.java @@ -31,6 +31,8 @@ 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.location.Location; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.TaskBuilder; import com.google.common.base.Function; import com.google.common.base.Functions; @@ -56,8 +58,6 @@ import brooklyn.event.feed.function.FunctionPollConfig; import brooklyn.util.collections.CollectionFunctionals; import brooklyn.util.guava.Functionals; import brooklyn.util.guava.IfFunctions; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.TaskBuilder; import brooklyn.util.text.Identifiers; import brooklyn.util.text.StringPredicates; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlDriver.java b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlDriver.java index ddfce38..2c90142 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlDriver.java +++ b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlDriver.java @@ -18,8 +18,9 @@ */ package brooklyn.entity.database.mysql; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; + import brooklyn.entity.basic.SoftwareProcessDriver; -import brooklyn.util.task.system.ProcessTaskWrapper; /** * The {@link SoftwareProcessDriver} for MySQL. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNode.java b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNode.java index 0ab51d0..99b53c5 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNode.java +++ b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNode.java @@ -22,6 +22,7 @@ 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.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; @@ -36,8 +37,8 @@ import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSens import brooklyn.event.basic.MapConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; + import org.apache.brooklyn.location.basic.PortRanges; -import brooklyn.util.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/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNodeImpl.java b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNodeImpl.java index 00a591b..dfbcbf1 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNodeImpl.java +++ b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlNodeImpl.java @@ -21,6 +21,7 @@ package 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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,10 +30,11 @@ 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 brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.guava.Maybe; import brooklyn.util.text.Identifiers; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java index 2e748e8..32b530d 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java +++ b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java @@ -43,6 +43,8 @@ import 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; @@ -53,8 +55,6 @@ import brooklyn.util.net.Urls; import brooklyn.util.os.Os; import brooklyn.util.ssh.BashCommands; import brooklyn.util.stream.Streams; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.text.ComparableVersion; import brooklyn.util.text.Identifiers; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlDriver.java b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlDriver.java index 9aaf7c2..02ad039 100644 --- a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlDriver.java +++ b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlDriver.java @@ -18,8 +18,9 @@ */ package brooklyn.entity.database.postgresql; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; + import brooklyn.entity.basic.SoftwareProcessDriver; -import brooklyn.util.task.system.ProcessTaskWrapper; /** * The {@link brooklyn.entity.basic.SoftwareProcessDriver} for PostgreSQL. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNode.java b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNode.java index 793debf..20f4b76 100644 --- a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNode.java +++ b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNode.java @@ -22,6 +22,7 @@ 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.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; @@ -31,8 +32,8 @@ import brooklyn.entity.database.DatastoreMixins; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.effector.Effectors; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; + import org.apache.brooklyn.location.basic.PortRanges; -import brooklyn.util.flags.SetFromFlag; /** * PostgreSQL database node entity. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java index 7572845..d82e637 100644 --- a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java +++ b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java @@ -19,6 +19,9 @@ package brooklyn.entity.database.postgresql; import org.apache.brooklyn.api.entity.Effector; +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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,14 +37,13 @@ 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 brooklyn.util.ResourceUtils; + import brooklyn.util.collections.Jsonya; -import brooklyn.util.config.ConfigBag; import brooklyn.util.guava.Maybe; import brooklyn.util.ssh.BashCommands; -import brooklyn.util.task.DynamicTasks; public class PostgreSqlNodeChefImplFromScratch extends EffectorStartableImpl implements PostgreSqlNode { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java index 71f63d9..c4b02de 100644 --- a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java +++ b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java @@ -18,12 +18,12 @@ */ package brooklyn.entity.database.postgresql; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.entity.effector.EffectorBody; -import brooklyn.util.config.ConfigBag; public class PostgreSqlNodeImpl extends SoftwareProcessImpl implements PostgreSqlNode { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java index a23f2bc..5ff0175 100644 --- a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java +++ b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java @@ -48,6 +48,10 @@ import 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.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 brooklyn.util.collections.MutableList; @@ -56,10 +60,6 @@ import brooklyn.util.exceptions.Exceptions; import brooklyn.util.net.Urls; import brooklyn.util.os.Os; import brooklyn.util.stream.Streams; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.ssh.SshTasks; -import brooklyn.util.task.ssh.SshTasks.OnFailingTask; -import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.text.Identifiers; import brooklyn.util.text.StringFunctions; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepNode.java b/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepNode.java index 8e990dd..edfbda5 100644 --- a/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepNode.java +++ b/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepNode.java @@ -21,6 +21,7 @@ package 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.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; @@ -31,7 +32,6 @@ import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; -import brooklyn.util.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/incubator-brooklyn/blob/699b3f65/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java index 5d8e984..36eb963 100644 --- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java @@ -33,10 +33,10 @@ 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 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/699b3f65/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBroker.java b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBroker.java index 2e59bd4..b8bbdca 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBroker.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBroker.java @@ -20,6 +20,7 @@ package brooklyn.entity.messaging.activemq; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; @@ -33,7 +34,6 @@ import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.time.Duration; /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single ActiveMQ broker instance. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/messaging/src/main/java/brooklyn/entity/messaging/amqp/AmqpExchange.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/amqp/AmqpExchange.java b/software/messaging/src/main/java/brooklyn/entity/messaging/amqp/AmqpExchange.java index f2eeee3..0ddd854 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/amqp/AmqpExchange.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/amqp/AmqpExchange.java @@ -19,9 +19,9 @@ package 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 brooklyn.util.flags.SetFromFlag; /** * An interface that describes an AMQP exchange. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/Kafka.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/Kafka.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/Kafka.java index ff7c368..64123b3 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/Kafka.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/Kafka.java @@ -18,12 +18,13 @@ */ package brooklyn.entity.messaging.kafka; +import org.apache.brooklyn.core.util.flags.SetFromFlag; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.util.flags.SetFromFlag; /** * Shared Kafka broker and zookeeper properties. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBroker.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBroker.java index 28b51c9..71b20c5 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBroker.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBroker.java @@ -20,6 +20,7 @@ package brooklyn.entity.messaging.kafka; 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; @@ -30,8 +31,9 @@ import 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 brooklyn.util.flags.SetFromFlag; + import brooklyn.util.time.Duration; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java index 8ebe328..3a24377 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java @@ -24,6 +24,7 @@ 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.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynConfigKeys; @@ -35,7 +36,6 @@ import brooklyn.entity.trait.Startable; import brooklyn.entity.zookeeper.ZooKeeperNode; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.time.Duration; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java index fa4e915..106690a 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java @@ -19,6 +19,7 @@ package brooklyn.entity.messaging.kafka; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; @@ -27,7 +28,6 @@ import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.zookeeper.ZooKeeperNode; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.time.Duration; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBroker.java b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBroker.java index 876ade8..a2af8a4 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBroker.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBroker.java @@ -22,6 +22,7 @@ import java.util.Map; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; @@ -34,7 +35,6 @@ import brooklyn.entity.messaging.jms.JMSBroker; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.util.flags.SetFromFlag; /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Qpid broker instance, using AMQP 0-10.