http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsExpect100ContinueTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsExpect100ContinueTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsExpect100ContinueTest.java index 30cbfed..7f45188 100644 --- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsExpect100ContinueTest.java +++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsExpect100ContinueTest.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.rebind.persister.jclouds; +import org.apache.brooklyn.management.ManagementContext; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.domain.Blob; @@ -30,7 +31,6 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; import brooklyn.location.jclouds.JcloudsLocation; import brooklyn.location.jclouds.JcloudsUtil; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.text.Identifiers; import ch.qos.logback.classic.Level;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java index 37549a6..c13e93a 100644 --- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java +++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java @@ -20,6 +20,7 @@ package brooklyn.entity.rebind.persister.jclouds; import java.io.IOException; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -32,7 +33,6 @@ import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.PersistenceObjectStore.StoreObjectAccessorWithLock; import brooklyn.entity.rebind.persister.PersistenceStoreObjectAccessorWriterTestFixture; import brooklyn.entity.rebind.persister.StoreObjectAccessorLocking; -import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.net.Urls; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/locations/jclouds/src/test/java/brooklyn/location/jclouds/BailOutJcloudsLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/BailOutJcloudsLocation.java b/locations/jclouds/src/test/java/brooklyn/location/jclouds/BailOutJcloudsLocation.java index ba5dc2b..2567c79 100644 --- a/locations/jclouds/src/test/java/brooklyn/location/jclouds/BailOutJcloudsLocation.java +++ b/locations/jclouds/src/test/java/brooklyn/location/jclouds/BailOutJcloudsLocation.java @@ -21,8 +21,10 @@ package brooklyn.location.jclouds; import java.util.Collections; import java.util.Map; + import javax.annotation.Nullable; +import org.apache.brooklyn.management.ManagementContext; import org.jclouds.compute.ComputeService; import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.Template; @@ -37,7 +39,6 @@ import brooklyn.config.BrooklynProperties; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.location.LocationSpec; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java b/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java index 89d3f27..c83663e 100644 --- a/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java +++ b/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertTrue; import java.util.List; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -36,7 +37,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.location.NoMachinesAvailableException; import brooklyn.location.basic.SshMachineLocation; import brooklyn.location.jclouds.JcloudsLocation; -import brooklyn.management.ManagementContext; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AwsEc2LocationWindowsLiveTest.groovy ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AwsEc2LocationWindowsLiveTest.groovy b/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AwsEc2LocationWindowsLiveTest.groovy index 3722564..acbb32f 100644 --- a/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AwsEc2LocationWindowsLiveTest.groovy +++ b/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AwsEc2LocationWindowsLiveTest.groovy @@ -30,7 +30,7 @@ import brooklyn.entity.basic.Entities import brooklyn.location.basic.SshMachineLocation import brooklyn.location.jclouds.JcloudsLocation import brooklyn.location.jclouds.JcloudsSshMachineLocation -import brooklyn.management.ManagementContext +import org.apache.brooklyn.management.ManagementContext import com.google.common.collect.ImmutableMap http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java b/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java index c73a54d..53745bb 100644 --- a/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java +++ b/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java @@ -23,8 +23,9 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.entity.basic.AbstractEntity; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalSubscriptionManager; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.util.task.BasicExecutionManager; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java b/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java index 2c772b8..d3f41b2 100644 --- a/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java +++ b/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java @@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +35,6 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.EntityLocal; import brooklyn.event.Sensor; -import brooklyn.management.Task; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy b/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy index f415b33..65d6f5f 100644 --- a/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy +++ b/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy @@ -30,7 +30,7 @@ import brooklyn.entity.basic.Entities import brooklyn.entity.basic.EntityLocal import brooklyn.event.Sensor import brooklyn.event.basic.BasicAttributeSensor -import brooklyn.management.SubscriptionContext +import org.apache.brooklyn.management.SubscriptionContext import brooklyn.management.internal.LocalManagementContext class DeltaEnrichersTests { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/policy/src/test/java/brooklyn/enricher/RollingMeanEnricherTest.groovy ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/enricher/RollingMeanEnricherTest.groovy b/policy/src/test/java/brooklyn/enricher/RollingMeanEnricherTest.groovy index 24b281d..2638180 100644 --- a/policy/src/test/java/brooklyn/enricher/RollingMeanEnricherTest.groovy +++ b/policy/src/test/java/brooklyn/enricher/RollingMeanEnricherTest.groovy @@ -30,7 +30,7 @@ import brooklyn.entity.basic.Entities import brooklyn.entity.basic.EntityLocal import brooklyn.event.Sensor import brooklyn.event.basic.BasicAttributeSensor -import brooklyn.management.SubscriptionContext +import org.apache.brooklyn.management.SubscriptionContext class RollingMeanEnricherTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/policy/src/test/java/brooklyn/enricher/RollingTimeWindowMeanEnricherTest.groovy ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/enricher/RollingTimeWindowMeanEnricherTest.groovy b/policy/src/test/java/brooklyn/enricher/RollingTimeWindowMeanEnricherTest.groovy index ae45081..4e6cc26 100644 --- a/policy/src/test/java/brooklyn/enricher/RollingTimeWindowMeanEnricherTest.groovy +++ b/policy/src/test/java/brooklyn/enricher/RollingTimeWindowMeanEnricherTest.groovy @@ -31,7 +31,7 @@ import brooklyn.entity.basic.Entities import brooklyn.entity.basic.EntityLocal import brooklyn.event.Sensor import brooklyn.event.basic.BasicAttributeSensor -import brooklyn.management.SubscriptionContext +import org.apache.brooklyn.management.SubscriptionContext class RollingTimeWindowMeanEnricherTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java b/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java index 57abb98..49a64e6 100644 --- a/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java +++ b/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.management.SubscriptionContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -34,7 +35,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; import brooklyn.event.basic.BasicSensorEvent; import brooklyn.event.basic.Sensors; -import brooklyn.management.SubscriptionContext; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java b/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java index 9a79fa6..963ad47 100644 --- a/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java +++ b/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.Random; import java.util.Set; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -40,7 +41,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.management.ManagementContext; import brooklyn.policy.loadbalancing.BalanceableContainer; import brooklyn.policy.loadbalancing.MockContainerEntity; import brooklyn.policy.loadbalancing.MockItemEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/policy/src/test/java/brooklyn/policy/ha/ConnectionFailureDetectorTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ConnectionFailureDetectorTest.java b/policy/src/test/java/brooklyn/policy/ha/ConnectionFailureDetectorTest.java index fa02438..7747746 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ConnectionFailureDetectorTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ConnectionFailureDetectorTest.java @@ -28,6 +28,7 @@ import java.net.ServerSocket; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.policy.PolicySpec; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -38,7 +39,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.management.ManagementContext; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; import brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java b/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java index bb91fde..2a1c552 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java @@ -24,6 +24,7 @@ import static org.testng.Assert.fail; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.policy.EnricherSpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +41,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.management.ManagementContext; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; import brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java b/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java index 60f7dd8..3e41f9d 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; @@ -44,7 +45,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.management.ManagementContext; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; import brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java b/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java index 43a31c7..57edf5f 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; @@ -52,7 +53,6 @@ import brooklyn.event.SensorEventListener; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.management.ManagementContext; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; import brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java b/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java index 93a2fa3..8419066 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.policy.PolicySpec; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -39,7 +40,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.FailingEntity; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.management.ManagementContext; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; import brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java index 8b64ddc..476d0b1 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +40,6 @@ import brooklyn.location.MachineLocation; import brooklyn.location.MachineProvisioningLocation; import brooklyn.location.PortRange; import brooklyn.location.basic.LocationConfigKeys; -import brooklyn.management.TaskAdaptable; import brooklyn.util.collections.MutableSet; import brooklyn.util.flags.TypeCoercions; import brooklyn.util.guava.Maybe; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java b/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java index a773c98..aabbf53 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java @@ -22,10 +22,11 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collection; +import org.apache.brooklyn.management.Task; + import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers; import brooklyn.entity.software.MachineLifecycleEffectorTasks; import brooklyn.location.Location; -import brooklyn.management.Task; import brooklyn.util.collections.QuorumCheck; import brooklyn.util.config.ConfigBag; import brooklyn.util.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java index 2dcfa7e..4be5e0b 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java @@ -20,6 +20,7 @@ package brooklyn.entity.basic; import java.util.Map; +import org.apache.brooklyn.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +31,6 @@ import brooklyn.entity.software.MachineLifecycleEffectorTasks; import brooklyn.entity.trait.StartableMethods; import brooklyn.location.MachineLocation; import brooklyn.location.MachineProvisioningLocation; -import brooklyn.management.TaskAdaptable; import brooklyn.util.config.ConfigBag; import brooklyn.util.task.DynamicTasks; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java index 1fe7fac..481e46c 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java @@ -30,6 +30,7 @@ import java.util.TimerTask; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.policy.EnricherSpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +53,6 @@ import brooklyn.location.PortRange; import brooklyn.location.basic.LocationConfigKeys; import brooklyn.location.basic.SshMachineLocation; import brooklyn.location.cloud.CloudLocationConfig; -import brooklyn.management.Task; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/basic/lifecycle/ScriptHelper.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/lifecycle/ScriptHelper.java b/software/base/src/main/java/brooklyn/entity/basic/lifecycle/ScriptHelper.java index 6d524d5..172bc6f 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/lifecycle/ScriptHelper.java +++ b/software/base/src/main/java/brooklyn/entity/basic/lifecycle/ScriptHelper.java @@ -19,7 +19,6 @@ package brooklyn.entity.basic.lifecycle; import static java.lang.String.format; - import brooklyn.util.internal.ssh.ShellTool; import groovy.lang.Closure; @@ -33,15 +32,15 @@ import java.util.concurrent.Callable; import javax.annotation.Nullable; +import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.TaskQueueingContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.ExecutionContext; -import brooklyn.management.Task; -import brooklyn.management.TaskQueueingContext; import brooklyn.util.GroovyJavaMethods; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.RuntimeInterruptedException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynClusterImpl.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynClusterImpl.java index 61b42d5..79d0f6e 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynClusterImpl.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynClusterImpl.java @@ -21,6 +21,7 @@ package brooklyn.entity.brooklynnode; import java.util.Collection; import java.util.concurrent.Callable; +import org.apache.brooklyn.management.ha.ManagementNodeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +36,6 @@ import brooklyn.entity.brooklynnode.effector.SelectMasterEffectorBody; import brooklyn.entity.group.DynamicClusterImpl; import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.function.FunctionPollConfig; -import brooklyn.management.ha.ManagementNodeState; import brooklyn.util.time.Duration; import com.google.common.collect.FluentIterable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java index aec545b..8cbec04 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java @@ -24,7 +24,11 @@ import java.util.List; import java.util.Map; import brooklyn.BrooklynVersion; + import org.apache.brooklyn.catalog.Catalog; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementNodeState; + import brooklyn.config.ConfigKey; import brooklyn.entity.Effector; import brooklyn.entity.basic.BrooklynConfigKeys; @@ -40,8 +44,6 @@ import brooklyn.event.basic.Sensors; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import brooklyn.event.basic.MapConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.management.ha.HighAvailabilityMode; -import brooklyn.management.ha.ManagementNodeState; import brooklyn.util.collections.MutableMap; import brooklyn.util.flags.SetFromFlag; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java index a477c6f..fb838eb 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java @@ -26,6 +26,9 @@ import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nullable; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.http.HttpStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,9 +61,6 @@ import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.event.feed.http.JsonFunctions; import brooklyn.location.access.BrooklynAccessUtils; import brooklyn.location.basic.Locations; -import brooklyn.management.Task; -import brooklyn.management.TaskAdaptable; -import brooklyn.management.ha.ManagementNodeState; import brooklyn.util.collections.Jsonya; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynClusterUpgradeEffectorBody.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynClusterUpgradeEffectorBody.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynClusterUpgradeEffectorBody.java index 8d24d66..e4d5e76 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynClusterUpgradeEffectorBody.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynClusterUpgradeEffectorBody.java @@ -24,6 +24,9 @@ import java.util.Collections; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementNodeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,9 +46,6 @@ import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.Effectors; import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.management.TaskAdaptable; -import brooklyn.management.ha.HighAvailabilityMode; -import brooklyn.management.ha.ManagementNodeState; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.net.Urls; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java index d4575a4..d09bb8e 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java @@ -20,6 +20,8 @@ package brooklyn.entity.brooklynnode.effector; import java.util.Map; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementNodeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,8 +44,6 @@ import brooklyn.entity.effector.Effectors; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.basic.MapConfigKey; -import brooklyn.management.ha.HighAvailabilityMode; -import brooklyn.management.ha.ManagementNodeState; import brooklyn.util.config.ConfigBag; import brooklyn.util.net.Urls; import brooklyn.util.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/SelectMasterEffectorBody.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/SelectMasterEffectorBody.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/SelectMasterEffectorBody.java index af07f3a..89a70b4 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/SelectMasterEffectorBody.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/SelectMasterEffectorBody.java @@ -22,6 +22,8 @@ import java.util.NoSuchElementException; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementNodeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,8 +38,6 @@ import brooklyn.entity.brooklynnode.BrooklynNode.SetHighAvailabilityModeEffector import brooklyn.entity.brooklynnode.BrooklynNode.SetHighAvailabilityPriorityEffector; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.Effectors; -import brooklyn.management.ha.HighAvailabilityMode; -import brooklyn.management.ha.ManagementNodeState; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.repeat.Repeater; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/SetHighAvailabilityModeEffectorBody.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/SetHighAvailabilityModeEffectorBody.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/SetHighAvailabilityModeEffectorBody.java index 531e122..cfc32bf 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/SetHighAvailabilityModeEffectorBody.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/SetHighAvailabilityModeEffectorBody.java @@ -18,6 +18,8 @@ */ package brooklyn.entity.brooklynnode.effector; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.http.HttpStatus; import brooklyn.entity.Effector; @@ -28,8 +30,6 @@ import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.Effectors; import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.event.feed.http.JsonFunctions; -import brooklyn.management.ha.HighAvailabilityMode; -import brooklyn.management.ha.ManagementNodeState; import brooklyn.util.config.ConfigBag; import brooklyn.util.guava.Functionals; import brooklyn.util.http.HttpToolResponse; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/chef/ChefAttributeFeed.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/chef/ChefAttributeFeed.java b/software/base/src/main/java/brooklyn/entity/chef/ChefAttributeFeed.java index 4cf7a95..e39cc83 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefAttributeFeed.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefAttributeFeed.java @@ -28,6 +28,7 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.management.ExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +41,6 @@ import brooklyn.event.feed.AbstractFeed; import brooklyn.event.feed.PollHandler; import brooklyn.event.feed.Poller; import brooklyn.event.feed.ssh.SshPollValue; -import brooklyn.management.ExecutionContext; import brooklyn.util.flags.TypeCoercions; import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/chef/ChefSoloDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/chef/ChefSoloDriver.java b/software/base/src/main/java/brooklyn/entity/chef/ChefSoloDriver.java index 02d4530..67f53c5 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefSoloDriver.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefSoloDriver.java @@ -18,13 +18,14 @@ */ package brooklyn.entity.chef; +import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.management.TaskFactory; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityLocal; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.TaskAdaptable; -import brooklyn.management.TaskFactory; import brooklyn.util.task.DynamicTasks; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/chef/ChefSoloTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/chef/ChefSoloTasks.java b/software/base/src/main/java/brooklyn/entity/chef/ChefSoloTasks.java index d555821..161e6fa 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefSoloTasks.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefSoloTasks.java @@ -20,8 +20,9 @@ package brooklyn.entity.chef; import java.util.Map; +import org.apache.brooklyn.management.TaskFactory; + import brooklyn.entity.software.SshEffectorTasks; -import brooklyn.management.TaskFactory; import brooklyn.util.ssh.BashCommands; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/chef/ChefTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/chef/ChefTasks.java b/software/base/src/main/java/brooklyn/entity/chef/ChefTasks.java index 5eb5ee2..f53f1f5 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefTasks.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefTasks.java @@ -20,14 +20,14 @@ package brooklyn.entity.chef; import java.util.Map; +import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.management.TaskFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.Entity; import brooklyn.entity.effector.EffectorTasks; import brooklyn.entity.software.SshEffectorTasks; -import brooklyn.management.TaskAdaptable; -import brooklyn.management.TaskFactory; import brooklyn.util.collections.MutableMap; import brooklyn.util.file.ArchiveTasks; import brooklyn.util.file.ArchiveUtils.ArchiveType; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java index 1069cd6..6451222 100644 --- a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java +++ b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java @@ -22,6 +22,8 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import org.apache.brooklyn.management.LocationManager; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,8 +47,6 @@ import brooklyn.location.NoMachinesAvailableException; import brooklyn.location.basic.BasicLocationDefinition; import brooklyn.location.basic.Machines; import brooklyn.location.dynamic.DynamicLocation; -import brooklyn.management.LocationManager; -import brooklyn.management.Task; import brooklyn.util.collections.MutableMap; import brooklyn.util.guava.Maybe; import brooklyn.util.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocationResolver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocationResolver.java b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocationResolver.java index 83cb20e..a881ca0 100644 --- a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocationResolver.java +++ b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocationResolver.java @@ -26,6 +26,7 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +43,6 @@ import brooklyn.location.basic.BasicLocationRegistry; import brooklyn.location.basic.LocationInternal; import brooklyn.location.basic.LocationPropertiesFromBrooklynProperties; import brooklyn.location.dynamic.DynamicLocation; -import brooklyn.management.ManagementContext; import brooklyn.util.collections.MutableMap; import brooklyn.util.text.KeyValueParser; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/service/EntityLaunchListener.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/service/EntityLaunchListener.java b/software/base/src/main/java/brooklyn/entity/service/EntityLaunchListener.java index a374ffe..30672cb 100644 --- a/software/base/src/main/java/brooklyn/entity/service/EntityLaunchListener.java +++ b/software/base/src/main/java/brooklyn/entity/service/EntityLaunchListener.java @@ -23,14 +23,15 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.management.ExecutionManager; +import org.apache.brooklyn.management.Task; + import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.BrooklynTaskTags.EffectorCallTag; import brooklyn.entity.basic.Lifecycle; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.management.ExecutionManager; -import brooklyn.management.Task; import brooklyn.util.task.Tasks; public class EntityLaunchListener implements Runnable, SensorEventListener<Lifecycle> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 fe6650b..685d25e 100644 --- a/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java +++ b/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java @@ -23,6 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.io.File; import java.util.Map; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.policy.Enricher; import brooklyn.config.ConfigKey; @@ -35,7 +36,6 @@ import brooklyn.entity.effector.EffectorTasks; import brooklyn.entity.trait.HasShortName; import brooklyn.location.basic.SshMachineLocation; import brooklyn.location.cloud.names.AbstractCloudMachineNamer; -import brooklyn.management.Task; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 5d6e55a..1b79329 100644 --- a/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java +++ b/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java @@ -20,6 +20,8 @@ package brooklyn.entity.service; import java.util.Set; +import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.policy.Enricher; import brooklyn.config.ConfigKey; @@ -34,8 +36,6 @@ import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.effector.EffectorTasks; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.ExecutionContext; -import brooklyn.management.Task; import brooklyn.util.net.Urls; import brooklyn.util.task.BasicExecutionManager; import brooklyn.util.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/main/java/brooklyn/entity/service/SystemServiceInstaller.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/service/SystemServiceInstaller.java b/software/base/src/main/java/brooklyn/entity/service/SystemServiceInstaller.java index a4d8b6d..c8d4973 100644 --- a/software/base/src/main/java/brooklyn/entity/service/SystemServiceInstaller.java +++ b/software/base/src/main/java/brooklyn/entity/service/SystemServiceInstaller.java @@ -18,7 +18,7 @@ */ package brooklyn.entity.service; -import brooklyn.management.Task; +import org.apache.brooklyn.management.Task; public interface SystemServiceInstaller { Task<?> getServiceInstallTask(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 57a5926..a8421c8 100644 --- a/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java +++ b/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java @@ -21,6 +21,7 @@ package brooklyn.entity.software; import java.util.List; import java.util.concurrent.Callable; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +33,6 @@ import com.google.common.collect.Lists; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.EntityInternal; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.Task; import brooklyn.util.net.Protocol; import brooklyn.util.ssh.BashCommands; import brooklyn.util.ssh.IptablesCommands; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 3a881ef..17dc5ed 100644 --- a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java @@ -28,6 +28,7 @@ import java.util.concurrent.Callable; import javax.annotation.Nullable; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,7 +73,6 @@ import brooklyn.location.basic.Locations; import brooklyn.location.basic.Machines; import brooklyn.location.basic.SshMachineLocation; import brooklyn.location.cloud.CloudLocationConfig; -import brooklyn.management.Task; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 7d1474f..88e6873 100644 --- a/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java @@ -23,6 +23,7 @@ import java.util.Map; import javax.annotation.Nullable; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +42,6 @@ import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory; import brooklyn.location.Location; import brooklyn.location.basic.LocationInternal; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.Task; import brooklyn.util.config.ConfigBag; import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.ssh.BashCommands; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 4b7c9d6..db61a34 100644 --- a/software/base/src/main/java/brooklyn/entity/software/StaticSensor.java +++ b/software/base/src/main/java/brooklyn/entity/software/StaticSensor.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.software; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,7 +27,6 @@ import brooklyn.enricher.basic.Propagator; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.effector.AddSensor; -import brooklyn.management.Task; import brooklyn.util.config.ConfigBag; import brooklyn.util.guava.Maybe; import brooklyn.util.task.Tasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 d468750..bcb9ad3 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 @@ -23,6 +23,7 @@ import java.util.concurrent.Callable; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +38,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.management.Task; import brooklyn.util.config.ConfigBag; import brooklyn.util.task.DynamicTasks; import brooklyn.util.task.Tasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java index 6fab1c7..feeba70 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java @@ -21,6 +21,7 @@ package brooklyn.entity; import java.util.List; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -29,7 +30,6 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java index 1ca1ad5..232ce4f 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java @@ -21,6 +21,7 @@ package brooklyn.entity; import java.util.List; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -33,7 +34,6 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java b/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java index 97b2163..477a4cc 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -31,7 +32,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 6449f16..8f53cb9 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java @@ -24,6 +24,7 @@ import static org.testng.Assert.assertTrue; import java.util.List; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -39,7 +40,6 @@ import brooklyn.event.basic.DependentConfiguration; import brooklyn.location.LocationSpec; import brooklyn.location.basic.FixedListMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.Task; import brooklyn.test.Asserts; import brooklyn.util.task.TaskInternal; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 6fe4183..d9dbf67 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java @@ -28,6 +28,7 @@ import java.util.Collections; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -43,7 +44,6 @@ import brooklyn.location.MachineProvisioningLocation; import brooklyn.location.NoMachinesAvailableException; import brooklyn.location.basic.AbstractLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.TestApplication; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 0693d7e..fd78fa4 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java @@ -30,6 +30,9 @@ import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.management.EntityManager; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.TaskAdaptable; import org.apache.brooklyn.test.EntityTestUtils; import org.jclouds.util.Throwables2; import org.slf4j.Logger; @@ -65,9 +68,6 @@ import brooklyn.location.basic.FixedListMachineProvisioningLocation; import brooklyn.location.basic.Locations; import brooklyn.location.basic.SimulatedLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.EntityManager; -import brooklyn.management.Task; -import brooklyn.management.TaskAdaptable; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 15f4fd4..3399b56 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 @@ -24,6 +24,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -34,7 +35,6 @@ import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.BrooklynTaskTags.WrappedStream; import brooklyn.location.NoMachinesAvailableException; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.management.Task; import brooklyn.util.collections.MutableMap; import brooklyn.util.repeat.Repeater; import brooklyn.util.task.BasicExecutionContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java index cd3c18d..d244b95 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java @@ -27,6 +27,7 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.Callable; +import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.http.client.methods.HttpPost; import org.slf4j.Logger; @@ -49,7 +50,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.feed.AttributePollHandler; import brooklyn.event.feed.DelegatingPollHandler; import brooklyn.event.feed.Poller; -import brooklyn.management.ha.ManagementNodeState; import brooklyn.util.collections.MutableList; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 fba1ac3..5bf7f48 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java +++ b/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java @@ -21,6 +21,7 @@ package brooklyn.entity.chef; import java.io.File; import java.io.IOException; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -31,7 +32,6 @@ import brooklyn.entity.basic.EntityInternal; import brooklyn.location.Location; import brooklyn.location.MachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.ManagementContext; 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/f7f03580/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 a420181..fc964c1 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.chef; import java.io.ByteArrayOutputStream; import java.io.IOException; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -30,7 +31,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.TestApplication; import brooklyn.util.stream.StreamGobbler; import brooklyn.util.task.system.ProcessTaskWrapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverToyMySqlEntity.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverToyMySqlEntity.java b/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverToyMySqlEntity.java index 16dc4f4..e04e4fd 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverToyMySqlEntity.java +++ b/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverToyMySqlEntity.java @@ -18,6 +18,9 @@ */ package brooklyn.entity.chef.mysql; +import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.management.TaskFactory; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcessImpl; @@ -27,8 +30,6 @@ import brooklyn.entity.chef.ChefSoloDriver; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.feed.ssh.SshFeed; import brooklyn.event.feed.ssh.SshPollConfig; -import brooklyn.management.TaskAdaptable; -import brooklyn.management.TaskFactory; import brooklyn.util.collections.MutableMap; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java b/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java index 16e6aa0..30f1222 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.fail; import java.util.List; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -36,7 +37,6 @@ import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.NoMachinesAvailableException; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java index f3328de..c2a75b0 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertTrue; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.Test; import com.google.common.base.CaseFormat; @@ -31,7 +32,6 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java index ca4e5ca..c99a6ec 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java @@ -24,6 +24,7 @@ import static org.testng.Assert.assertTrue; import java.io.File; import java.util.Collection; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -34,7 +35,6 @@ import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.rebind.RebindOptions; import brooklyn.entity.rebind.RebindTestUtils; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java index db0e228..7e89017 100644 --- a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java @@ -22,13 +22,15 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; + import com.google.common.base.CaseFormat; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; + +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 24fa657..5394c11 100644 --- a/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java @@ -24,6 +24,7 @@ import static org.testng.Assert.assertTrue; import java.util.List; +import org.apache.brooklyn.management.Task; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -49,7 +50,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.DependentConfiguration; import brooklyn.event.basic.Sensors; import brooklyn.location.jclouds.BailOutJcloudsLocation; -import brooklyn.management.Task; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; import brooklyn.util.task.TaskInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 6558b3c..951325c 100644 --- a/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java @@ -20,6 +20,8 @@ package brooklyn.entity.software; import java.util.Arrays; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -34,8 +36,6 @@ import brooklyn.entity.software.SshEffectorTasks.SshEffectorBody; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; import brooklyn.test.entity.TestApplication; import brooklyn.util.config.ConfigBag; import brooklyn.util.task.system.ProcessTaskWrapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 b922733..f22130c 100644 --- a/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java @@ -22,6 +22,9 @@ import java.io.File; import java.io.IOException; import java.util.Arrays; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.management.TaskFactory; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,9 +38,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.ManagementContext; -import brooklyn.management.TaskAdaptable; -import brooklyn.management.TaskFactory; import brooklyn.test.entity.TestApplication; import brooklyn.util.exceptions.PropagatedRuntimeException; import brooklyn.util.net.Urls; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java index 9736f5d..a14818e 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.database.mariadb; import java.io.File; import java.net.InetAddress; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -35,7 +36,6 @@ import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java index 0e4b263..b4ce563 100644 --- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.database.postgresql; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -31,7 +32,6 @@ import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java index d1b7324..f7c2ae4 100644 --- a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertEquals; import java.util.Arrays; import java.util.List; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -42,7 +43,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.PortRanges; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java index d9fd1c1..917f163 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.management.TaskWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +48,6 @@ import brooklyn.location.Location; import brooklyn.location.access.BrooklynAccessUtils; import brooklyn.location.basic.Machines; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.TaskWrapper; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java index 73ed934..d7cba84 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java @@ -29,6 +29,7 @@ import java.util.concurrent.Callable; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.apache.brooklyn.management.Task; import org.apache.http.auth.UsernamePasswordCredentials; import brooklyn.entity.Entity; @@ -45,7 +46,6 @@ import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.location.OsDetails; import brooklyn.location.access.BrooklynAccessUtils; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.Task; import brooklyn.util.collections.MutableMap; import brooklyn.util.http.HttpTool; import brooklyn.util.http.HttpToolResponse; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java b/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java index e8eb494..feff6ef 100644 --- a/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java +++ b/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; @@ -46,7 +47,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.feed.ConfigToAttributes; import brooklyn.location.access.BrooklynAccessUtils; import brooklyn.location.basic.Machines; -import brooklyn.management.Task; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxControllerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxControllerImpl.java b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxControllerImpl.java index 6da6dc6..b485449 100644 --- a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxControllerImpl.java +++ b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxControllerImpl.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.management.SubscriptionHandle; import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +47,6 @@ import brooklyn.event.feed.ConfigToAttributes; import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.event.feed.http.HttpValueFunctions; -import brooklyn.management.SubscriptionHandle; import brooklyn.util.ResourceUtils; import brooklyn.util.file.ArchiveUtils; import brooklyn.util.guava.Functionals; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java index b99591b..023067a 100644 --- a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java +++ b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java @@ -23,6 +23,7 @@ import static java.lang.String.format; import java.util.List; import java.util.concurrent.atomic.AtomicLong; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +37,6 @@ import brooklyn.entity.drivers.downloads.DownloadResolver; import brooklyn.entity.proxy.AbstractController; import brooklyn.location.OsDetails; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.ManagementContext; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/UrlMappingImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/UrlMappingImpl.java b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/UrlMappingImpl.java index 66b88c0..482e317 100644 --- a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/UrlMappingImpl.java +++ b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/UrlMappingImpl.java @@ -25,6 +25,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Set; +import org.apache.brooklyn.management.SubscriptionHandle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +40,6 @@ import brooklyn.entity.trait.Startable; import brooklyn.entity.webapp.WebAppServiceConstants; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.management.SubscriptionHandle; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java b/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java index d02d292..b5af827 100644 --- a/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java +++ b/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +46,6 @@ import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.event.feed.ConfigToAttributes; import brooklyn.location.Location; -import brooklyn.management.Task; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.QuorumCheck.QuorumChecks;
