http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/enricher/TimeFractionDeltaEnricher.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/enricher/TimeFractionDeltaEnricher.java b/policy/src/main/java/brooklyn/enricher/TimeFractionDeltaEnricher.java index e1fce23..d86aec0 100644 --- a/policy/src/main/java/brooklyn/enricher/TimeFractionDeltaEnricher.java +++ b/policy/src/main/java/brooklyn/enricher/TimeFractionDeltaEnricher.java @@ -27,9 +27,9 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.enricher.basic.AbstractTypeTransformingEnricher; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.time.Duration;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/enricher/TimeWeightedDeltaEnricher.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/enricher/TimeWeightedDeltaEnricher.java b/policy/src/main/java/brooklyn/enricher/TimeWeightedDeltaEnricher.java index 3f7357d..0d5e066 100644 --- a/policy/src/main/java/brooklyn/enricher/TimeWeightedDeltaEnricher.java +++ b/policy/src/main/java/brooklyn/enricher/TimeWeightedDeltaEnricher.java @@ -24,13 +24,13 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.enricher.basic.AbstractTypeTransformingEnricher; import brooklyn.enricher.basic.YamlTimeWeightedDeltaEnricher; import brooklyn.util.GroovyJavaMethods; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetrics.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetrics.java b/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetrics.java index e927c1e..f717812 100644 --- a/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetrics.java +++ b/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetrics.java @@ -21,10 +21,10 @@ package brooklyn.entity.brooklyn; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.util.flags.SetFromFlag; @ImplementedBy(BrooklynMetricsImpl.class) public interface BrooklynMetrics extends Entity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 93ece4a..caf1120 100644 --- a/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java +++ b/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java @@ -26,9 +26,9 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.internal.LocalSubscriptionManager; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.util.task.BasicExecutionManager; import brooklyn.entity.basic.AbstractEntity; -import brooklyn.util.task.BasicExecutionManager; import com.google.common.util.concurrent.ThreadFactoryBuilder; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/policy/autoscaling/AutoScalerPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/autoscaling/AutoScalerPolicy.java b/policy/src/main/java/brooklyn/policy/autoscaling/AutoScalerPolicy.java index 28c2123..9da5e12 100644 --- a/policy/src/main/java/brooklyn/policy/autoscaling/AutoScalerPolicy.java +++ b/policy/src/main/java/brooklyn/policy/autoscaling/AutoScalerPolicy.java @@ -40,6 +40,9 @@ import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.core.util.task.Tasks; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynTaskTags; @@ -52,9 +55,6 @@ import brooklyn.policy.autoscaling.SizeHistory.WindowSummary; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.policy.loadbalancing.LoadBalancingPolicy; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.SetFromFlag; -import brooklyn.util.flags.TypeCoercions; -import brooklyn.util.task.Tasks; import brooklyn.util.time.Duration; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunPolicy.java b/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunPolicy.java index 1747424..dde1609 100644 --- a/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunPolicy.java +++ b/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunPolicy.java @@ -38,6 +38,7 @@ 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.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +47,6 @@ import brooklyn.policy.basic.AbstractPolicy; import brooklyn.policy.followthesun.FollowTheSunPool.ContainerItemPair; import brooklyn.policy.loadbalancing.Movable; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.SetFromFlag; import com.google.common.base.Function; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 f88dc60..0c2f4d2 100644 --- a/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java +++ b/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java @@ -28,6 +28,9 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.util.task.BasicTask; +import org.apache.brooklyn.core.util.task.ScheduledTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,9 +42,6 @@ import brooklyn.policy.basic.AbstractPolicy; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.SetFromFlag; -import brooklyn.util.task.BasicTask; -import brooklyn.util.task.ScheduledTask; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java b/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java index 9be8256..9a869ae 100644 --- a/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java +++ b/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java @@ -23,13 +23,13 @@ import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.policy.basic.AbstractPolicy; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.javalang.JavaClassNames; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/policy/ha/ConnectionFailureDetector.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/ha/ConnectionFailureDetector.java b/policy/src/main/java/brooklyn/policy/ha/ConnectionFailureDetector.java index a1a59a4..ff5d60e 100644 --- a/policy/src/main/java/brooklyn/policy/ha/ConnectionFailureDetector.java +++ b/policy/src/main/java/brooklyn/policy/ha/ConnectionFailureDetector.java @@ -20,13 +20,13 @@ package brooklyn.policy.ha; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.event.Sensor; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.policy.ha.HASensors.FailureDescriptor; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.guava.Maybe; import brooklyn.util.net.Networking; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/policy/ha/ServiceFailureDetector.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/ha/ServiceFailureDetector.java b/policy/src/main/java/brooklyn/policy/ha/ServiceFailureDetector.java index 7ae6f33..2e4b719 100644 --- a/policy/src/main/java/brooklyn/policy/ha/ServiceFailureDetector.java +++ b/policy/src/main/java/brooklyn/policy/ha/ServiceFailureDetector.java @@ -24,6 +24,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.brooklyn.api.event.SensorEvent; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.util.task.BasicTask; +import org.apache.brooklyn.core.util.task.ScheduledTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,11 +42,7 @@ import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.SetFromFlag; -import brooklyn.util.task.BasicTask; -import brooklyn.util.task.ScheduledTask; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/policy/ha/ServiceReplacer.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/ha/ServiceReplacer.java b/policy/src/main/java/brooklyn/policy/ha/ServiceReplacer.java index 459c13e..884f2df 100644 --- a/policy/src/main/java/brooklyn/policy/ha/ServiceReplacer.java +++ b/policy/src/main/java/brooklyn/policy/ha/ServiceReplacer.java @@ -35,6 +35,8 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; @@ -48,9 +50,7 @@ import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.SetFromFlag; import com.google.common.base.Ticker; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/policy/ha/ServiceRestarter.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/ha/ServiceRestarter.java b/policy/src/main/java/brooklyn/policy/ha/ServiceRestarter.java index 3a3f0b4..d53434e 100644 --- a/policy/src/main/java/brooklyn/policy/ha/ServiceRestarter.java +++ b/policy/src/main/java/brooklyn/policy/ha/ServiceRestarter.java @@ -28,6 +28,8 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; @@ -40,8 +42,6 @@ import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/policy/ha/SshMachineFailureDetector.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/ha/SshMachineFailureDetector.java b/policy/src/main/java/brooklyn/policy/ha/SshMachineFailureDetector.java index 7d31cf7..1fa9982 100644 --- a/policy/src/main/java/brooklyn/policy/ha/SshMachineFailureDetector.java +++ b/policy/src/main/java/brooklyn/policy/ha/SshMachineFailureDetector.java @@ -23,16 +23,18 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.catalog.Catalog; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicNotificationSensor; + import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe; -import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.time.Duration; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/policy/loadbalancing/ItemsInContainersGroup.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/loadbalancing/ItemsInContainersGroup.java b/policy/src/main/java/brooklyn/policy/loadbalancing/ItemsInContainersGroup.java index ac93639..efd41d8 100644 --- a/policy/src/main/java/brooklyn/policy/loadbalancing/ItemsInContainersGroup.java +++ b/policy/src/main/java/brooklyn/policy/loadbalancing/ItemsInContainersGroup.java @@ -21,11 +21,11 @@ package brooklyn.policy.loadbalancing; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.DynamicGroup; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.flags.SetFromFlag; import com.google.common.base.Predicate; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java b/policy/src/main/java/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java index f5ae09c..2c50883 100644 --- a/policy/src/main/java/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java +++ b/policy/src/main/java/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java @@ -35,6 +35,7 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +45,6 @@ import brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.policy.loadbalancing.BalanceableWorkerPool.ContainerItemPair; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.SetFromFlag; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/policy/loadbalancing/Movable.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/loadbalancing/Movable.java b/policy/src/main/java/brooklyn/policy/loadbalancing/Movable.java index f95ba4f..b0f1658 100644 --- a/policy/src/main/java/brooklyn/policy/loadbalancing/Movable.java +++ b/policy/src/main/java/brooklyn/policy/loadbalancing/Movable.java @@ -19,6 +19,7 @@ package brooklyn.policy.loadbalancing; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; @@ -26,7 +27,6 @@ import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.MethodEffector; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.flags.SetFromFlag; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java b/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java index 9777e03..7c7a9f3 100644 --- a/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java +++ b/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.http.BetterMockWebServer; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -35,9 +36,10 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.event.basic.Sensors; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; + import brooklyn.util.collections.MutableMap; -import brooklyn.util.http.BetterMockWebServer; import com.google.common.collect.ImmutableList; import com.google.mockwebserver.MockResponse; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/test/java/brooklyn/enricher/RebindEnricherTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/enricher/RebindEnricherTest.java b/policy/src/test/java/brooklyn/enricher/RebindEnricherTest.java index ac1b5c1..a01fd17 100644 --- a/policy/src/test/java/brooklyn/enricher/RebindEnricherTest.java +++ b/policy/src/test/java/brooklyn/enricher/RebindEnricherTest.java @@ -24,6 +24,7 @@ import java.net.URL; import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.http.BetterMockWebServer; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; @@ -33,7 +34,6 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.rebind.RebindTestFixtureWithApp; import brooklyn.event.basic.Sensors; import brooklyn.test.Asserts; -import brooklyn.util.http.BetterMockWebServer; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 5a88649..c679224 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java @@ -35,6 +35,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; @@ -60,7 +61,6 @@ import org.apache.brooklyn.location.basic.SimulatedLocation; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; -import brooklyn.util.config.ConfigBag; import brooklyn.util.javalang.JavaClassNames; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 ce0fbf1..81cff78 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java @@ -31,6 +31,7 @@ import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -45,7 +46,6 @@ import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.trait.FailingEntity; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntity.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntity.java b/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntity.java index da4472e..70d4b57 100644 --- a/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntity.java +++ b/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntity.java @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.EffectorParam; @@ -30,7 +31,6 @@ import brooklyn.entity.basic.AbstractGroup; import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.flags.SetFromFlag; @ImplementedBy(MockContainerEntityImpl.class) public interface MockContainerEntity extends AbstractGroup, BalanceableContainer<Movable>, Startable { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java index bf7454d..a1b4ea8 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java +++ b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java @@ -29,19 +29,19 @@ import java.util.Map; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.core.util.text.TemplateProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.os.Os; import brooklyn.util.stream.ReaderInputStream; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; import brooklyn.util.text.Strings; -import brooklyn.util.text.TemplateProcessor; import com.google.common.annotations.Beta; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java index c8efbb9..31ee4be 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java +++ b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java @@ -29,6 +29,11 @@ import java.util.Set; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; +import org.apache.brooklyn.core.util.internal.ssh.sshj.SshjTool; +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; @@ -45,18 +50,15 @@ import brooklyn.entity.basic.lifecycle.ScriptHelper; import brooklyn.entity.effector.EffectorTasks; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.feed.ConfigToAttributes; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe; -import brooklyn.util.internal.ssh.SshTool; -import brooklyn.util.internal.ssh.sshj.SshjTool; import brooklyn.util.os.Os; import brooklyn.util.ssh.BashCommands; import brooklyn.util.stream.KnownSizeInputStream; import brooklyn.util.stream.Streams; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; -import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.text.StringPredicates; import brooklyn.util.text.Strings; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 1a926a5..c7d19c1 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java @@ -27,6 +27,8 @@ import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.api.management.TaskAdaptable; +import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.core.util.task.DynamicTasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,9 +45,7 @@ import brooklyn.entity.trait.StartableMethods; import org.apache.brooklyn.location.basic.LocationConfigKeys; import brooklyn.util.collections.MutableSet; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.guava.Maybe; -import brooklyn.util.task.DynamicTasks; public class SameServerDriverLifecycleEffectorTasks extends MachineLifecycleEffectorTasks { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/basic/SameServerEntity.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SameServerEntity.java b/software/base/src/main/java/brooklyn/entity/basic/SameServerEntity.java index 080cb87..374402a 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SameServerEntity.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SameServerEntity.java @@ -24,6 +24,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers; @@ -31,7 +32,6 @@ import brooklyn.entity.trait.Startable; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.QuorumCheck; -import brooklyn.util.flags.SetFromFlag; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 32050fd..ff58d89 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java @@ -24,13 +24,13 @@ import java.util.Collection; 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.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.Tasks; import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers; import brooklyn.entity.software.MachineLifecycleEffectorTasks; import brooklyn.util.collections.QuorumCheck; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; public class SameServerEntityImpl extends AbstractEntity implements SameServerEntity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java index cf0dd6b..e80013f 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java @@ -24,6 +24,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Lifecycle.Transition; @@ -33,7 +34,6 @@ import brooklyn.event.basic.AttributeSensorAndConfigKey; import brooklyn.event.basic.MapConfigKey; import brooklyn.event.basic.Sensors; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.time.Duration; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 1067333..457bb12 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java @@ -23,6 +23,8 @@ import java.util.Map; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.MachineProvisioningLocation; 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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,8 +33,6 @@ import brooklyn.entity.basic.SoftwareProcess.RestartSoftwareParameters; import brooklyn.entity.basic.SoftwareProcess.RestartSoftwareParameters.RestartMachineMode; import brooklyn.entity.software.MachineLifecycleEffectorTasks; import brooklyn.entity.trait.StartableMethods; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.task.DynamicTasks; import brooklyn.util.text.Strings; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 dffe783..0ae6339 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java @@ -18,7 +18,6 @@ */ package brooklyn.entity.basic; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.guava.Maybe; import groovy.time.TimeDuration; @@ -42,6 +41,10 @@ import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.policy.EnricherSpec; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,10 +61,7 @@ import org.apache.brooklyn.location.cloud.CloudLocationConfig; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; import brooklyn.util.time.CountdownTimer; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java b/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java index b66bd62..29ef57f 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java +++ b/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java @@ -24,11 +24,13 @@ import java.util.Map; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver; +import org.apache.brooklyn.core.util.file.ArchiveUtils; import brooklyn.entity.basic.lifecycle.ScriptHelper; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableMap; -import brooklyn.util.file.ArchiveUtils; import brooklyn.util.guava.Maybe; import brooklyn.util.net.Urls; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunner.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunner.java b/software/base/src/main/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunner.java index 670b1df..7d51e22 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunner.java +++ b/software/base/src/main/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunner.java @@ -21,7 +21,7 @@ package brooklyn.entity.basic.lifecycle; import java.util.List; import java.util.Map; -import brooklyn.util.task.ssh.SshTasks; +import org.apache.brooklyn.core.util.task.ssh.SshTasks; /** Marks something which can run scripts. Called "Naive" because it hides too much of the complexity, * about script execution and other ssh-related tasks (put, etc). The {@link SshTasks} approach seems better. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 07532f8..da9e0a1 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; import java.io.ByteArrayOutputStream; @@ -35,20 +34,23 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.management.ExecutionContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskQueueingContext; +import org.apache.brooklyn.core.util.internal.ssh.ShellTool; +import org.apache.brooklyn.core.util.mutex.WithMutexes; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.TaskBuilder; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynTaskTags; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.GroovyJavaMethods; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.RuntimeInterruptedException; -import brooklyn.util.mutex.WithMutexes; import brooklyn.util.stream.Streams; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.TaskBuilder; -import brooklyn.util.task.Tasks; import brooklyn.util.text.Identifiers; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java index 7cbae99..22dae74 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java @@ -25,6 +25,10 @@ import java.util.concurrent.Callable; import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.http.HttpToolResponse; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.Tasks; import org.apache.http.HttpStatus; import brooklyn.entity.basic.AbstractEntity; @@ -39,11 +43,7 @@ import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.util.collections.Jsonya; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.http.HttpToolResponse; import brooklyn.util.net.Urls; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; import com.google.common.base.Function; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 da6016b..83314db 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java @@ -31,6 +31,7 @@ import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynConfigKeys; @@ -45,7 +46,6 @@ import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSens import brooklyn.event.basic.MapConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.net.Networking; import brooklyn.util.ssh.BashCommands; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 4250b74..4f1c2d5 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java @@ -31,6 +31,11 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.http.HttpToolResponse; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.TaskTags; +import org.apache.brooklyn.core.util.task.Tasks; import org.apache.http.HttpStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,21 +64,18 @@ import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.event.feed.http.JsonFunctions; + import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.basic.Locations; + import brooklyn.util.collections.Jsonya; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.exceptions.PropagatedRuntimeException; import brooklyn.util.guava.Functionals; -import brooklyn.util.http.HttpToolResponse; import brooklyn.util.javalang.Enums; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.repeat.Repeater; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.TaskTags; -import brooklyn.util.task.Tasks; import brooklyn.util.text.Strings; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java index ab4ffb2..55c544e 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java @@ -34,16 +34,18 @@ import brooklyn.entity.brooklynnode.BrooklynNode.ExistingFileBehaviour; import brooklyn.entity.drivers.downloads.DownloadSubstituters; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; import brooklyn.entity.software.SshEffectorTasks; + +import org.apache.brooklyn.core.util.file.ArchiveBuilder; +import org.apache.brooklyn.core.util.file.ArchiveUtils; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; +import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableMap; -import brooklyn.util.file.ArchiveBuilder; -import brooklyn.util.file.ArchiveUtils; -import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.net.Networking; import brooklyn.util.net.Urls; import brooklyn.util.os.Os; import brooklyn.util.ssh.BashCommands; -import brooklyn.util.task.DynamicTasks; import brooklyn.util.text.Identifiers; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/brooklynnode/EntityHttpClient.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/EntityHttpClient.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/EntityHttpClient.java index 25df319..58d1229 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/EntityHttpClient.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/EntityHttpClient.java @@ -20,8 +20,8 @@ package brooklyn.entity.brooklynnode; import java.util.Map; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpToolResponse; +import org.apache.brooklyn.core.util.http.HttpTool; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import com.google.common.base.Predicate; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/brooklynnode/EntityHttpClientImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/EntityHttpClientImpl.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/EntityHttpClientImpl.java index 2403380..59449a2 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/EntityHttpClientImpl.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/EntityHttpClientImpl.java @@ -25,6 +25,9 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.http.HttpTool; +import org.apache.brooklyn.core.util.http.HttpToolResponse; +import org.apache.brooklyn.core.util.task.Tasks; import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.HttpClient; import org.slf4j.Logger; @@ -37,11 +40,8 @@ import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpToolResponse; import brooklyn.util.net.Urls; import brooklyn.util.stream.Streams; -import brooklyn.util.task.Tasks; public class EntityHttpClientImpl implements EntityHttpClient { private static final Logger LOG = LoggerFactory.getLogger(EntityHttpClientImpl.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/brooklynnode/RemoteEffectorBuilder.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/RemoteEffectorBuilder.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/RemoteEffectorBuilder.java index 0cb944e..05b28eb 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/RemoteEffectorBuilder.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/RemoteEffectorBuilder.java @@ -23,11 +23,11 @@ import java.util.Collection; import java.util.Map; import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import brooklyn.entity.brooklynnode.BrooklynEntityMirrorImpl.RemoteEffector; import brooklyn.entity.effector.Effectors; import brooklyn.entity.effector.Effectors.EffectorBuilder; -import brooklyn.util.http.HttpToolResponse; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 798f9b5..df902b1 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 @@ -31,6 +31,9 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.api.management.ha.ManagementNodeState; +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; @@ -47,10 +50,7 @@ import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.Effectors; import brooklyn.entity.group.DynamicCluster; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.net.Urls; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; import brooklyn.util.time.Duration; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 9c3a17b..1706a93 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 @@ -26,6 +26,9 @@ import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.api.management.ha.ManagementNodeState; +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; @@ -44,10 +47,7 @@ import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.Effectors; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.basic.MapConfigKey; -import brooklyn.util.config.ConfigBag; import brooklyn.util.net.Urls; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; import brooklyn.util.text.Identifiers; import brooklyn.util.text.Strings; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 3817b6b..d5a5555 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 @@ -27,6 +27,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.task.DynamicTasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,9 +41,7 @@ import brooklyn.entity.brooklynnode.BrooklynNode.SetHighAvailabilityPriorityEffe import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.Effectors; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.repeat.Repeater; -import brooklyn.util.task.DynamicTasks; import brooklyn.util.time.Duration; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 2edf67d..89387d5 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 @@ -21,6 +21,8 @@ package brooklyn.entity.brooklynnode.effector; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.http.HttpStatus; import brooklyn.entity.brooklynnode.BrooklynNode; @@ -30,9 +32,7 @@ import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.Effectors; import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.event.feed.http.JsonFunctions; -import brooklyn.util.config.ConfigBag; import brooklyn.util.guava.Functionals; -import brooklyn.util.http.HttpToolResponse; import brooklyn.util.javalang.Enums; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/SetHighAvailabilityPriorityEffectorBody.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/SetHighAvailabilityPriorityEffectorBody.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/SetHighAvailabilityPriorityEffectorBody.java index 884d7ba..b9496d5 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/SetHighAvailabilityPriorityEffectorBody.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/SetHighAvailabilityPriorityEffectorBody.java @@ -19,6 +19,8 @@ package brooklyn.entity.brooklynnode.effector; import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.http.HttpStatus; import brooklyn.entity.brooklynnode.BrooklynNode; @@ -26,8 +28,6 @@ import brooklyn.entity.brooklynnode.BrooklynNode.SetHighAvailabilityPriorityEffe import brooklyn.entity.brooklynnode.EntityHttpClient; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.Effectors; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.http.HttpToolResponse; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 fde4f51..8d3a1ef 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefAttributeFeed.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefAttributeFeed.java @@ -31,6 +31,8 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,8 +43,6 @@ import brooklyn.event.feed.AbstractFeed; import brooklyn.event.feed.PollHandler; import brooklyn.event.feed.Poller; import brooklyn.event.feed.ssh.SshPollValue; -import brooklyn.util.flags.TypeCoercions; -import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.time.Duration; import com.google.common.base.Joiner; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/chef/ChefConfig.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/chef/ChefConfig.java b/software/base/src/main/java/brooklyn/entity/chef/ChefConfig.java index 769d8d0..e768280 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefConfig.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefConfig.java @@ -18,11 +18,12 @@ */ package brooklyn.entity.chef; +import org.apache.brooklyn.core.util.flags.SetFromFlag; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.MapConfigKey; import brooklyn.event.basic.SetConfigKey; -import brooklyn.util.flags.SetFromFlag; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java index 9f6bf82..402d8d3 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java @@ -23,6 +23,11 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.TaskTags; +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; @@ -37,14 +42,9 @@ import org.apache.brooklyn.location.basic.Machines; import brooklyn.util.collections.Jsonya; import brooklyn.util.collections.Jsonya.Navigator; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.net.Urls; import brooklyn.util.ssh.BashCommands; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.TaskTags; -import brooklyn.util.task.Tasks; -import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.text.Strings; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/chef/ChefServerTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/chef/ChefServerTasks.java b/software/base/src/main/java/brooklyn/entity/chef/ChefServerTasks.java index 743e335..b192f0b 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefServerTasks.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefServerTasks.java @@ -24,8 +24,8 @@ import java.io.IOException; import java.nio.charset.Charset; import java.security.KeyPair; +import org.apache.brooklyn.core.util.crypto.SecureKeys; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.crypto.SecureKeys; import com.google.common.base.Throwables; import com.google.common.io.Files; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 0d9935c..ce727af 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefSoloDriver.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefSoloDriver.java @@ -21,12 +21,13 @@ package brooklyn.entity.chef; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.api.management.TaskFactory; +import org.apache.brooklyn.core.util.task.DynamicTasks; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.ConfigKeys; + import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.task.DynamicTasks; import com.google.common.annotations.Beta; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 369df99..31f99a5 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefTasks.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefTasks.java @@ -23,19 +23,19 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.api.management.TaskFactory; +import org.apache.brooklyn.core.util.file.ArchiveTasks; +import org.apache.brooklyn.core.util.file.ArchiveUtils.ArchiveType; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.TaskBuilder; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.effector.EffectorTasks; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.util.collections.MutableMap; -import brooklyn.util.file.ArchiveTasks; -import brooklyn.util.file.ArchiveUtils.ArchiveType; import brooklyn.util.net.Urls; import brooklyn.util.ssh.BashCommands; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.TaskBuilder; -import brooklyn.util.task.Tasks; import brooklyn.util.text.Identifiers; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/chef/KnifeConvergeTaskFactory.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/chef/KnifeConvergeTaskFactory.java b/software/base/src/main/java/brooklyn/entity/chef/KnifeConvergeTaskFactory.java index f9ec730..b32cad7 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/KnifeConvergeTaskFactory.java +++ b/software/base/src/main/java/brooklyn/entity/chef/KnifeConvergeTaskFactory.java @@ -29,16 +29,18 @@ import com.google.common.base.Strings; import com.google.common.net.HostAndPort; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.effector.EffectorTasks; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.Jsonya; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.ssh.BashCommands; -import brooklyn.util.task.system.ProcessTaskWrapper; import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/chef/KnifeTaskFactory.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/chef/KnifeTaskFactory.java b/software/base/src/main/java/brooklyn/entity/chef/KnifeTaskFactory.java index f3b748f..52abcc2 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/KnifeTaskFactory.java +++ b/software/base/src/main/java/brooklyn/entity/chef/KnifeTaskFactory.java @@ -24,15 +24,15 @@ import java.util.List; import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.core.util.internal.ssh.process.ProcessTool; +import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.core.util.task.system.ProcessTaskFactory; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; +import org.apache.brooklyn.core.util.task.system.internal.SystemProcessTaskFactory; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.util.collections.MutableList; -import brooklyn.util.internal.ssh.process.ProcessTool; -import brooklyn.util.task.Tasks; -import brooklyn.util.task.system.ProcessTaskFactory; -import brooklyn.util.task.system.ProcessTaskWrapper; -import brooklyn.util.task.system.internal.SystemProcessTaskFactory; import brooklyn.util.text.StringEscapes.BashStringEscapes; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java b/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java index 1853259..e6b3245 100644 --- a/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java +++ b/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java @@ -28,6 +28,13 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.core.util.internal.ssh.ShellTool; +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.ProcessTaskFactory; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,18 +55,13 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.effector.EffectorTasks; import brooklyn.entity.software.SshEffectorTasks; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.TypeCoercions; -import brooklyn.util.internal.ssh.ShellTool; 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.ProcessTaskFactory; -import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.text.StringEscapes.BashStringEscapes; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java b/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java index 2f88ff8..7e7c4c6 100644 --- a/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java +++ b/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java @@ -26,6 +26,9 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.core.util.BrooklynMavenArtifacts; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,11 +36,11 @@ import brooklyn.config.ConfigKey; import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.entity.basic.EntityInternal; import brooklyn.event.feed.jmx.JmxHelper; + import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.BrooklynMavenArtifacts; -import brooklyn.util.ResourceUtils; + import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.guava.Maybe; @@ -46,7 +49,6 @@ import brooklyn.util.jmx.jmxrmi.JmxRmiAgent; import brooklyn.util.maven.MavenArtifact; import brooklyn.util.maven.MavenRetriever; import brooklyn.util.net.Urls; -import brooklyn.util.task.Tasks; import brooklyn.util.text.Strings; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java b/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java index 2c91999..dc57a3d 100644 --- a/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java +++ b/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java @@ -26,13 +26,14 @@ import java.security.PrivateKey; import java.security.cert.Certificate; import java.security.cert.X509Certificate; +import org.apache.brooklyn.core.util.crypto.FluentKeySigner; +import org.apache.brooklyn.core.util.crypto.SecureKeys; +import org.apache.brooklyn.core.util.task.Tasks; + import brooklyn.util.collections.MutableMap.Builder; -import brooklyn.util.crypto.FluentKeySigner; -import brooklyn.util.crypto.SecureKeys; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.jmx.jmxmp.JmxmpAgent; import brooklyn.util.net.Urls; -import brooklyn.util.task.Tasks; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/java/UsesJava.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/java/UsesJava.java b/software/base/src/main/java/brooklyn/entity/java/UsesJava.java index 1f824a1..a1afb97 100644 --- a/software/base/src/main/java/brooklyn/entity/java/UsesJava.java +++ b/software/base/src/main/java/brooklyn/entity/java/UsesJava.java @@ -18,6 +18,8 @@ */ package brooklyn.entity.java; +import org.apache.brooklyn.core.util.flags.SetFromFlag; + import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; @@ -25,7 +27,6 @@ import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.MapConfigKey; import brooklyn.event.basic.SetConfigKey; -import brooklyn.util.flags.SetFromFlag; public interface UsesJava { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/java/UsesJavaMXBeans.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/java/UsesJavaMXBeans.java b/software/base/src/main/java/brooklyn/entity/java/UsesJavaMXBeans.java index f15e217..a556811 100644 --- a/software/base/src/main/java/brooklyn/entity/java/UsesJavaMXBeans.java +++ b/software/base/src/main/java/brooklyn/entity/java/UsesJavaMXBeans.java @@ -21,12 +21,12 @@ package brooklyn.entity.java; import java.util.Map; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.Sensors; -import brooklyn.util.flags.SetFromFlag; public interface UsesJavaMXBeans { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java b/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java index 141c5e5..2bb5bf0 100644 --- a/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java +++ b/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java @@ -24,6 +24,7 @@ import java.security.cert.Certificate; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.PortRange; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; @@ -34,8 +35,6 @@ import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.location.basic.PortRanges; -import brooklyn.util.flags.SetFromFlag; - public interface UsesJmx extends UsesJava { public static final int DEFAULT_JMX_PORT = 1099; // RMI port? http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/java/VanillaJavaApp.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/java/VanillaJavaApp.java b/software/base/src/main/java/brooklyn/entity/java/VanillaJavaApp.java index 42e3090..6ae48e8 100644 --- a/software/base/src/main/java/brooklyn/entity/java/VanillaJavaApp.java +++ b/software/base/src/main/java/brooklyn/entity/java/VanillaJavaApp.java @@ -23,13 +23,13 @@ import java.util.Map; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.event.basic.Sensors; import brooklyn.util.collections.MutableList; -import brooklyn.util.flags.SetFromFlag; import com.google.common.collect.Lists; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/java/VanillaJavaAppImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/java/VanillaJavaAppImpl.java b/software/base/src/main/java/brooklyn/entity/java/VanillaJavaAppImpl.java index 719a0ba..bbee991 100644 --- a/software/base/src/main/java/brooklyn/entity/java/VanillaJavaAppImpl.java +++ b/software/base/src/main/java/brooklyn/entity/java/VanillaJavaAppImpl.java @@ -24,12 +24,12 @@ import java.util.List; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.event.feed.jmx.JmxFeed; -import brooklyn.util.flags.SetFromFlag; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/java/VanillaJavaAppSshDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/java/VanillaJavaAppSshDriver.java b/software/base/src/main/java/brooklyn/entity/java/VanillaJavaAppSshDriver.java index 104dd7d..db1bb63 100644 --- a/software/base/src/main/java/brooklyn/entity/java/VanillaJavaAppSshDriver.java +++ b/software/base/src/main/java/brooklyn/entity/java/VanillaJavaAppSshDriver.java @@ -28,16 +28,18 @@ import java.util.Map; import javax.annotation.Nullable; import brooklyn.entity.basic.lifecycle.ScriptHelper; + +import org.apache.brooklyn.core.util.file.ArchiveBuilder; +import org.apache.brooklyn.core.util.file.ArchiveUtils; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; +import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.file.ArchiveBuilder; -import brooklyn.util.file.ArchiveUtils; -import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.net.Urls; import brooklyn.util.os.Os; -import brooklyn.util.task.Tasks; import brooklyn.util.text.StringEscapes.BashStringEscapes; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java b/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java index f101e66..7459c19 100644 --- a/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java +++ b/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java @@ -31,11 +31,13 @@ import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.feed.ssh.SshFeed; import brooklyn.event.feed.ssh.SshPollConfig; import brooklyn.event.feed.ssh.SshPollValue; + +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.task.DynamicTasks; -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/a4c0e5fd/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 c35e287..e5066f2 100644 --- a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java +++ b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java @@ -31,6 +31,7 @@ import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.LocationManager; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.util.task.DynamicTasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,7 +52,6 @@ import org.apache.brooklyn.location.dynamic.DynamicLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.guava.Maybe; -import brooklyn.util.task.DynamicTasks; import com.google.common.base.Function; import com.google.common.base.Joiner; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocation.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocation.java b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocation.java index 704459b..df0a76c 100644 --- a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocation.java +++ b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocation.java @@ -34,11 +34,10 @@ import brooklyn.entity.basic.ConfigKeys; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.dynamic.DynamicLocation; -import brooklyn.util.flags.SetFromFlag; - public class ServerPoolLocation extends AbstractLocation implements MachineProvisioningLocation<MachineLocation>, DynamicLocation<ServerPool, ServerPoolLocation> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 354653d..e263d0d 100644 --- a/software/base/src/main/java/brooklyn/entity/service/EntityLaunchListener.java +++ b/software/base/src/main/java/brooklyn/entity/service/EntityLaunchListener.java @@ -28,11 +28,11 @@ import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.management.ExecutionManager; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.task.Tasks; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.BrooklynTaskTags.EffectorCallTag; import brooklyn.entity.basic.Lifecycle; -import brooklyn.util.task.Tasks; public class EntityLaunchListener implements Runnable, SensorEventListener<Lifecycle> { private static final String SSH_LAUNCH_TASK_PREFIX = "ssh: launching";
