http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 300281f..f95ba4f 100644 --- a/policy/src/main/java/brooklyn/policy/loadbalancing/Movable.java +++ b/policy/src/main/java/brooklyn/policy/loadbalancing/Movable.java @@ -18,8 +18,9 @@ */ package brooklyn.policy.loadbalancing; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.MethodEffector;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 65d6f5f..47fcaf6 100644 --- a/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy +++ b/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy @@ -27,7 +27,7 @@ import org.testng.annotations.Test import brooklyn.entity.basic.AbstractApplication import brooklyn.entity.basic.AbstractEntity import brooklyn.entity.basic.Entities -import brooklyn.entity.basic.EntityLocal +import org.apache.brooklyn.api.entity.basic.EntityLocal import brooklyn.event.Sensor import brooklyn.event.basic.BasicAttributeSensor import org.apache.brooklyn.management.SubscriptionContext http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 836f117..a5a51c0 100644 --- a/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java +++ b/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java @@ -21,6 +21,8 @@ package brooklyn.enricher; import java.net.URL; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -30,10 +32,8 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 2638180..4c10f67 100644 --- a/policy/src/test/java/brooklyn/enricher/RollingMeanEnricherTest.groovy +++ b/policy/src/test/java/brooklyn/enricher/RollingMeanEnricherTest.groovy @@ -27,7 +27,7 @@ import org.testng.annotations.Test import brooklyn.entity.basic.AbstractApplication import brooklyn.entity.basic.AbstractEntity import brooklyn.entity.basic.Entities -import brooklyn.entity.basic.EntityLocal +import org.apache.brooklyn.api.entity.basic.EntityLocal import brooklyn.event.Sensor import brooklyn.event.basic.BasicAttributeSensor import org.apache.brooklyn.management.SubscriptionContext http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 4e6cc26..46555cd 100644 --- a/policy/src/test/java/brooklyn/enricher/RollingTimeWindowMeanEnricherTest.groovy +++ b/policy/src/test/java/brooklyn/enricher/RollingTimeWindowMeanEnricherTest.groovy @@ -28,7 +28,7 @@ import brooklyn.enricher.RollingTimeWindowMeanEnricher.ConfidenceQualifiedNumber import brooklyn.entity.basic.AbstractApplication import brooklyn.entity.basic.AbstractEntity import brooklyn.entity.basic.Entities -import brooklyn.entity.basic.EntityLocal +import org.apache.brooklyn.api.entity.basic.EntityLocal import brooklyn.event.Sensor import brooklyn.event.basic.BasicAttributeSensor import org.apache.brooklyn.management.SubscriptionContext http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 4572385..9926d3c 100644 --- a/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java +++ b/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java @@ -22,6 +22,8 @@ import static org.testng.Assert.assertEquals; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.SubscriptionContext; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -31,8 +33,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; import brooklyn.event.basic.BasicSensorEvent; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/entity/brooklyn/BrooklynMetricsTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/entity/brooklyn/BrooklynMetricsTest.java b/policy/src/test/java/brooklyn/entity/brooklyn/BrooklynMetricsTest.java index c500468..9d60ea0 100644 --- a/policy/src/test/java/brooklyn/entity/brooklyn/BrooklynMetricsTest.java +++ b/policy/src/test/java/brooklyn/entity/brooklyn/BrooklynMetricsTest.java @@ -21,6 +21,8 @@ package brooklyn.entity.brooklyn; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestApplicationNoEnrichersImpl; @@ -30,11 +32,9 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.SensorEventListener; import brooklyn.location.basic.SimulatedLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyMetricTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyMetricTest.java b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyMetricTest.java index 5bbeb46..20ff4d1 100644 --- a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyMetricTest.java +++ b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyMetricTest.java @@ -25,6 +25,7 @@ import static org.testng.Assert.assertTrue; import java.util.List; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestCluster; import org.apache.brooklyn.test.entity.TestEntity; @@ -33,7 +34,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java index ab105c5..58066a6 100644 --- a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java +++ b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertEquals; import java.util.Map; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -31,7 +32,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindTestFixtureWithApp; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicNotificationSensor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyReconfigurationTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyReconfigurationTest.java b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyReconfigurationTest.java index baa88e5..c9ab28e 100644 --- a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyReconfigurationTest.java +++ b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyReconfigurationTest.java @@ -20,6 +20,7 @@ package brooklyn.policy.autoscaling; import static brooklyn.policy.autoscaling.AutoScalerPolicyTest.currentSizeAsserter; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestCluster; import org.testng.annotations.AfterMethod; @@ -27,7 +28,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.test.Asserts; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java index d268620..74e9cc3 100644 --- a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java +++ b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java @@ -32,6 +32,8 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestCluster; @@ -42,9 +44,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Resizable; import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.test.Asserts; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/autoscaling/LocallyResizableEntity.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/autoscaling/LocallyResizableEntity.java b/policy/src/test/java/brooklyn/policy/autoscaling/LocallyResizableEntity.java index 70307a0..c6b3c09 100644 --- a/policy/src/test/java/brooklyn/policy/autoscaling/LocallyResizableEntity.java +++ b/policy/src/test/java/brooklyn/policy/autoscaling/LocallyResizableEntity.java @@ -20,9 +20,9 @@ package brooklyn.policy.autoscaling; import java.util.List; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.test.entity.TestCluster; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.trait.Resizable; import brooklyn.entity.trait.Startable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 e017e50..a4301ac 100644 --- a/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java +++ b/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java @@ -25,6 +25,10 @@ import java.util.Map; import java.util.Random; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; @@ -33,13 +37,9 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.DynamicGroup; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java b/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java index 51e5d8d..6c5bcec 100644 --- a/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java +++ b/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java @@ -27,13 +27,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.location.Location; import brooklyn.location.basic.SimulatedLocation; import brooklyn.policy.loadbalancing.BalanceableContainer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java b/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java index 6778771..8c96bdb 100644 --- a/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java +++ b/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java @@ -27,13 +27,13 @@ import java.util.List; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/ha/HaPolicyRebindTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/HaPolicyRebindTest.java b/policy/src/test/java/brooklyn/policy/ha/HaPolicyRebindTest.java index e428863..5dfbf65 100644 --- a/policy/src/test/java/brooklyn/policy/ha/HaPolicyRebindTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/HaPolicyRebindTest.java @@ -25,6 +25,8 @@ import static org.testng.Assert.fail; import java.util.List; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.entity.TestApplication; @@ -32,12 +34,10 @@ import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindTestFixtureWithApp; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 270fd87..cf6a811 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.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; @@ -40,7 +41,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.basic.ServiceStateLogicTest; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 fa8d654..3569040 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.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.EntityTestUtils; @@ -44,7 +45,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.basic.ServiceStateLogic.ServiceProblemsLogic; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 944b267..c1d9587 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.EntityTestUtils; @@ -40,7 +42,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; @@ -49,7 +50,6 @@ import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.QuorumCheck; import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.FailingEntity; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 745654d..faf2fc1 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.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; @@ -39,7 +40,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.FailingEntity; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/loadbalancing/AbstractLoadBalancingPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/AbstractLoadBalancingPolicyTest.java b/policy/src/test/java/brooklyn/policy/loadbalancing/AbstractLoadBalancingPolicyTest.java index e304635..551f61e 100644 --- a/policy/src/test/java/brooklyn/policy/loadbalancing/AbstractLoadBalancingPolicyTest.java +++ b/policy/src/test/java/brooklyn/policy/loadbalancing/AbstractLoadBalancingPolicyTest.java @@ -26,6 +26,10 @@ import java.util.Map; import java.util.Random; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,13 +37,9 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.DynamicGroup; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/loadbalancing/BalanceableWorkerPoolTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/BalanceableWorkerPoolTest.java b/policy/src/test/java/brooklyn/policy/loadbalancing/BalanceableWorkerPoolTest.java index aab292e..a816983 100644 --- a/policy/src/test/java/brooklyn/policy/loadbalancing/BalanceableWorkerPoolTest.java +++ b/policy/src/test/java/brooklyn/policy/loadbalancing/BalanceableWorkerPoolTest.java @@ -21,6 +21,9 @@ package brooklyn.policy.loadbalancing; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,14 +31,11 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.Group; import brooklyn.entity.basic.AbstractGroup; import brooklyn.entity.basic.AbstractGroupImpl; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.DynamicGroup; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.trait.Resizable; import brooklyn.location.basic.SimulatedLocation; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/loadbalancing/ItemsInContainersGroupTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/ItemsInContainersGroupTest.java b/policy/src/test/java/brooklyn/policy/loadbalancing/ItemsInContainersGroupTest.java index 173b158..0217f8c 100644 --- a/policy/src/test/java/brooklyn/policy/loadbalancing/ItemsInContainersGroupTest.java +++ b/policy/src/test/java/brooklyn/policy/loadbalancing/ItemsInContainersGroupTest.java @@ -20,17 +20,17 @@ package brooklyn.policy.loadbalancing; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.DynamicGroup; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyConcurrencyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyConcurrencyTest.java b/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyConcurrencyTest.java index 8b38a1c..69d380b 100644 --- a/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyConcurrencyTest.java +++ b/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyConcurrencyTest.java @@ -29,6 +29,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +38,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicySoakTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicySoakTest.java b/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicySoakTest.java index b85adf0..1bb8dc4 100644 --- a/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicySoakTest.java +++ b/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicySoakTest.java @@ -25,13 +25,13 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java b/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java index e0a720b..442e3b3 100644 --- a/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java +++ b/policy/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java @@ -21,10 +21,10 @@ package brooklyn.policy.loadbalancing; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 8e4a7c0..da4472e 100644 --- a/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntity.java +++ b/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntity.java @@ -20,13 +20,14 @@ package brooklyn.policy.loadbalancing; 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 brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.AbstractGroup; import brooklyn.entity.basic.MethodEffector; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.BasicConfigKey; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java b/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java index 8e54e14..37a9278 100644 --- a/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java +++ b/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java @@ -26,10 +26,10 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.locks.ReentrantLock; +import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractGroupImpl; import brooklyn.entity.basic.Attributes; import brooklyn.event.AttributeSensor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntity.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntity.java b/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntity.java index cd9a3fe..c6460b7 100644 --- a/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntity.java +++ b/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntity.java @@ -20,8 +20,9 @@ package brooklyn.policy.loadbalancing; import java.util.Map; -import brooklyn.entity.Entity; -import brooklyn.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntityImpl.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntityImpl.java b/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntityImpl.java index 70c0e62..4b504d6 100644 --- a/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntityImpl.java +++ b/policy/src/test/java/brooklyn/policy/loadbalancing/MockItemEntityImpl.java @@ -24,10 +24,10 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.ReentrantLock; +import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractEntity; import brooklyn.event.AttributeSensor; import brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 9fa6950..103ad49 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java +++ b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java @@ -27,6 +27,7 @@ import java.io.Reader; import java.io.StringReader; import java.util.Map; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -483,7 +484,7 @@ public abstract class AbstractSoftwareProcessDriver implements SoftwareProcessDr } /** - * @deprecated since 0.5.0; instead rely on {@link brooklyn.entity.drivers.downloads.DownloadResolverManager} to include local-repo, such as: + * @deprecated since 0.5.0; instead rely on {@link org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager} to include local-repo, such as: * * <pre> * {@code @@ -497,7 +498,7 @@ public abstract class AbstractSoftwareProcessDriver implements SoftwareProcessDr } /** - * @deprecated since 0.5.0; instead rely on {@link brooklyn.entity.drivers.downloads.DownloadResolverManager} to include local-repo + * @deprecated since 0.5.0; instead rely on {@link org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager} to include local-repo */ protected String getEntityVersionLabel(String separator) { return elvis(entity.getEntityType().getSimpleName(), http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 954b842..2ca32e9 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java +++ b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +42,6 @@ import com.google.common.collect.Sets; import brooklyn.config.BrooklynLogging; import brooklyn.entity.basic.lifecycle.NaiveScriptRunner; import brooklyn.entity.basic.lifecycle.ScriptHelper; -import brooklyn.entity.drivers.downloads.DownloadResolver; import brooklyn.entity.effector.EffectorTasks; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.feed.ConfigToAttributes; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessWinRmDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessWinRmDriver.java b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessWinRmDriver.java index c34e342..1c75f7f 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessWinRmDriver.java +++ b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessWinRmDriver.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.python.core.PyException; import brooklyn.config.ConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/base/src/main/java/brooklyn/entity/basic/EmptySoftwareProcess.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/EmptySoftwareProcess.java b/software/base/src/main/java/brooklyn/entity/basic/EmptySoftwareProcess.java index cd451be..17d2812 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/EmptySoftwareProcess.java +++ b/software/base/src/main/java/brooklyn/entity/basic/EmptySoftwareProcess.java @@ -18,7 +18,7 @@ */ package brooklyn.entity.basic; -import brooklyn.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; @ImplementedBy(EmptySoftwareProcessImpl.class) public interface EmptySoftwareProcess extends SoftwareProcess { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 476d0b1..fc9a136 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.api.entity.Entity; import org.apache.brooklyn.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +34,6 @@ import com.google.common.collect.Sets; import com.google.common.reflect.TypeToken; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.software.MachineLifecycleEffectorTasks; import brooklyn.entity.trait.StartableMethods; import brooklyn.location.MachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 e10a3b9..3f866c4 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SameServerEntity.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SameServerEntity.java @@ -20,10 +20,11 @@ package brooklyn.entity.basic; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.trait.Startable; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 064f462..50176b6 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java @@ -21,8 +21,9 @@ package brooklyn.entity.basic; import java.util.Collection; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Lifecycle.Transition; import brooklyn.entity.annotation.Effector; import brooklyn.entity.trait.Startable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriver.java b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriver.java index 2ab2a61..15afa28 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriver.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriver.java @@ -18,7 +18,9 @@ */ package brooklyn.entity.basic; -import brooklyn.entity.drivers.EntityDriver; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.drivers.EntityDriver; + import brooklyn.entity.trait.Startable; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 481e46c..d29f36c 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,10 @@ import java.util.TimerTask; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity; +import org.apache.brooklyn.api.entity.drivers.EntityDriverManager; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.policy.EnricherSpec; import org.slf4j.Logger; @@ -37,11 +41,8 @@ import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Lifecycle.Transition; import brooklyn.entity.basic.ServiceStateLogic.ServiceNotUpLogic; -import brooklyn.entity.drivers.DriverDependentEntity; -import brooklyn.entity.drivers.EntityDriverManager; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.event.feed.function.FunctionFeed; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcess.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcess.java b/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcess.java index 8bd12c0..1eadaa1 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcess.java +++ b/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcess.java @@ -18,9 +18,10 @@ */ package brooklyn.entity.basic; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; -import brooklyn.entity.proxying.ImplementedBy; /** * A {@link SoftwareProcess} entity that runs commands from an archive. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 ac29a87..af89c40 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java +++ b/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java @@ -22,8 +22,10 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver; + import brooklyn.entity.basic.lifecycle.ScriptHelper; -import brooklyn.entity.drivers.downloads.DownloadResolver; import brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.file.ArchiveUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/base/src/main/java/brooklyn/entity/basic/VanillaWindowsProcess.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/VanillaWindowsProcess.java b/software/base/src/main/java/brooklyn/entity/basic/VanillaWindowsProcess.java index a6213ac..7a2e750 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/VanillaWindowsProcess.java +++ b/software/base/src/main/java/brooklyn/entity/basic/VanillaWindowsProcess.java @@ -20,8 +20,9 @@ package brooklyn.entity.basic; import java.util.Collection; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/base/src/main/java/brooklyn/entity/basic/VanillaWindowsProcessWinRmDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/VanillaWindowsProcessWinRmDriver.java b/software/base/src/main/java/brooklyn/entity/basic/VanillaWindowsProcessWinRmDriver.java index 29c6e15..68a2f16 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/VanillaWindowsProcessWinRmDriver.java +++ b/software/base/src/main/java/brooklyn/entity/basic/VanillaWindowsProcessWinRmDriver.java @@ -18,6 +18,8 @@ */ package brooklyn.entity.basic; +import org.apache.brooklyn.api.entity.basic.EntityLocal; + import brooklyn.location.basic.WinRmMachineLocation; import brooklyn.util.net.UserAndHostAndPort; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynCluster.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynCluster.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynCluster.java index 65a7202..981743e 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynCluster.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynCluster.java @@ -20,14 +20,15 @@ package brooklyn.entity.brooklynnode; import java.util.Map; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.brooklynnode.effector.BrooklynNodeUpgradeEffectorBody; import brooklyn.entity.effector.Effectors; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 79d0f6e..cf69bb2 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynClusterImpl.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynClusterImpl.java @@ -21,12 +21,12 @@ package brooklyn.entity.brooklynnode; import java.util.Collection; import java.util.concurrent.Callable; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.ha.ManagementNodeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.enricher.Enrichers; -import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityFunctions; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.basic.ServiceStateLogic; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirror.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirror.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirror.java index 35e2169..dfd3821 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirror.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirror.java @@ -20,12 +20,13 @@ package brooklyn.entity.brooklynnode; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.brooklynnode.BrooklynNode; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 48ed3a8..7cbae99 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java @@ -24,9 +24,9 @@ import java.util.concurrent.Callable; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Effector; import org.apache.http.HttpStatus; -import brooklyn.entity.Effector; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 8cbec04..2532094 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java @@ -25,18 +25,18 @@ import java.util.Map; import brooklyn.BrooklynVersion; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; 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; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.effector.Effectors; import brooklyn.entity.java.UsesJava; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 fb838eb..e052439 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,8 @@ import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.management.TaskAdaptable; import org.apache.brooklyn.management.ha.ManagementNodeState; @@ -36,8 +38,6 @@ import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.config.render.RendererHints; import brooklyn.enricher.Enrichers; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 79f4b95..f9d1d6c 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/EntityHttpClientImpl.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/EntityHttpClientImpl.java @@ -23,6 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.HttpClient; import org.slf4j.Logger; @@ -32,7 +33,6 @@ import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.event.AttributeSensor; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/base/src/main/java/brooklyn/entity/brooklynnode/LocalBrooklynNode.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/LocalBrooklynNode.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/LocalBrooklynNode.java index eaa1a4a..7b09850 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/LocalBrooklynNode.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/LocalBrooklynNode.java @@ -18,7 +18,7 @@ */ package brooklyn.entity.brooklynnode; -import brooklyn.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; /** * A {@link BrooklynNode} entity that represents the local Brooklyn service. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 3b1cdc1..0cb944e 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/RemoteEffectorBuilder.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/RemoteEffectorBuilder.java @@ -22,7 +22,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Map; -import brooklyn.entity.Effector; +import org.apache.brooklyn.api.entity.Effector; + import brooklyn.entity.brooklynnode.BrooklynEntityMirrorImpl.RemoteEffector; import brooklyn.entity.effector.Effectors; import brooklyn.entity.effector.Effectors.EffectorBuilder; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 e4d5e76..f4026aa 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,15 +24,16 @@ import java.util.Collections; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; 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; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.basic.EntityTasks; @@ -45,7 +46,6 @@ import brooklyn.entity.brooklynnode.BrooklynNode.SetHighAvailabilityModeEffector import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.Effectors; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.EntitySpec; 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/a76dac4f/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 d09bb8e..435cd9d 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,14 +20,16 @@ package brooklyn.entity.brooklynnode.effector; import java.util.Map; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.management.ha.ManagementNodeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; @@ -38,10 +40,8 @@ import brooklyn.entity.basic.SoftwareProcess.StopSoftwareParameters.StopMode; import brooklyn.entity.brooklynnode.BrooklynCluster; import brooklyn.entity.brooklynnode.BrooklynNode; import brooklyn.entity.brooklynnode.BrooklynNodeDriver; -import brooklyn.entity.drivers.DriverDependentEntity; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.Effectors; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.basic.MapConfigKey; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 89a70b4..7e74e3b 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,14 +22,14 @@ import java.util.NoSuchElementException; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.management.ha.ManagementNodeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.brooklynnode.BrooklynCluster; import brooklyn.entity.brooklynnode.BrooklynCluster.SelectMasterEffector; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 cfc32bf..cd66114 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,11 +18,11 @@ */ package brooklyn.entity.brooklynnode.effector; +import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.http.HttpStatus; -import brooklyn.entity.Effector; import brooklyn.entity.brooklynnode.BrooklynNode; import brooklyn.entity.brooklynnode.BrooklynNode.SetHighAvailabilityModeEffector; import brooklyn.entity.brooklynnode.EntityHttpClient; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 8af0a33..884d7ba 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 @@ -18,9 +18,9 @@ */ package brooklyn.entity.brooklynnode.effector; +import org.apache.brooklyn.api.entity.Effector; import org.apache.http.HttpStatus; -import brooklyn.entity.Effector; import brooklyn.entity.brooklynnode.BrooklynNode; import brooklyn.entity.brooklynnode.BrooklynNode.SetHighAvailabilityPriorityEffector; import brooklyn.entity.brooklynnode.EntityHttpClient; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 e39cc83..c4a14cf 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.api.entity.basic.EntityLocal; import org.apache.brooklyn.management.ExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +36,6 @@ import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.event.AttributeSensor; import brooklyn.event.feed.AbstractFeed; import brooklyn.event.feed.PollHandler; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/base/src/main/java/brooklyn/entity/chef/ChefConfigs.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/chef/ChefConfigs.java b/software/base/src/main/java/brooklyn/entity/chef/ChefConfigs.java index 3d924c5..6bd6b02 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefConfigs.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefConfigs.java @@ -20,10 +20,11 @@ package brooklyn.entity.chef; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.MapConfigKey.MapModifications; import brooklyn.event.basic.SetConfigKey.SetModifications; import brooklyn.util.git.GithubUrls; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/base/src/main/java/brooklyn/entity/chef/ChefEntity.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/chef/ChefEntity.java b/software/base/src/main/java/brooklyn/entity/chef/ChefEntity.java index 2929424..e42eb29 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefEntity.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefEntity.java @@ -18,8 +18,9 @@ */ package brooklyn.entity.chef; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.proxying.ImplementedBy; @ImplementedBy(ChefEntityImpl.class) public interface ChefEntity extends SoftwareProcess, ChefConfig { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 ed6722b..eca280a 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java @@ -21,10 +21,10 @@ package brooklyn.entity.chef; import java.util.Collection; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.SoftwareProcess; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 67f53c5..202449c 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,13 @@ */ package brooklyn.entity.chef; +import org.apache.brooklyn.api.entity.basic.EntityLocal; 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.util.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 f53f1f5..042ace4 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefTasks.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefTasks.java @@ -20,12 +20,12 @@ package brooklyn.entity.chef; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; 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.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 ba974ad..0d4dfdb 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/KnifeConvergeTaskFactory.java +++ b/software/base/src/main/java/brooklyn/entity/chef/KnifeConvergeTaskFactory.java @@ -27,10 +27,11 @@ import java.util.Map; import com.google.common.base.Strings; import com.google.common.net.HostAndPort; + +import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.effector.EffectorTasks; import brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.Jsonya; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 8a0ffed..f3b748f 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/KnifeTaskFactory.java +++ b/software/base/src/main/java/brooklyn/entity/chef/KnifeTaskFactory.java @@ -23,8 +23,9 @@ import java.util.List; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.util.collections.MutableList; import brooklyn.util.internal.ssh.process.ProcessTool; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/base/src/main/java/brooklyn/entity/java/JavaAppUtils.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/java/JavaAppUtils.java b/software/base/src/main/java/brooklyn/entity/java/JavaAppUtils.java index 12e9787..acc5c12 100644 --- a/software/base/src/main/java/brooklyn/entity/java/JavaAppUtils.java +++ b/software/base/src/main/java/brooklyn/entity/java/JavaAppUtils.java @@ -29,11 +29,12 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.management.openmbean.CompositeData; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; + import brooklyn.config.render.RendererHints; import brooklyn.enricher.RollingTimeWindowMeanEnricher; import brooklyn.enricher.TimeFractionDeltaEnricher; -import brooklyn.entity.Entity; -import brooklyn.entity.basic.EntityLocal; import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.event.feed.jmx.JmxAttributePollConfig; import brooklyn.event.feed.jmx.JmxFeed; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 79cef17..de223fb 100644 --- a/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java +++ b/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +46,6 @@ import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.effector.EffectorTasks; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 f10cf8d..463b009 100644 --- a/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java +++ b/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java @@ -24,14 +24,14 @@ import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.event.feed.jmx.JmxHelper; import brooklyn.location.access.BrooklynAccessUtils; import brooklyn.location.basic.Locations; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 c315a15..79ed6b9 100644 --- a/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java +++ b/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java @@ -21,8 +21,9 @@ package brooklyn.entity.java; import java.security.PrivateKey; import java.security.cert.Certificate; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.AttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 7c6eaef..86885d9 100644 --- a/software/base/src/main/java/brooklyn/entity/java/VanillaJavaApp.java +++ b/software/base/src/main/java/brooklyn/entity/java/VanillaJavaApp.java @@ -21,10 +21,11 @@ package brooklyn.entity.java; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 64577e2..719a0ba 100644 --- a/software/base/src/main/java/brooklyn/entity/java/VanillaJavaAppImpl.java +++ b/software/base/src/main/java/brooklyn/entity/java/VanillaJavaAppImpl.java @@ -23,10 +23,10 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.event.feed.jmx.JmxFeed; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/base/src/main/java/brooklyn/entity/machine/MachineEntity.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/machine/MachineEntity.java b/software/base/src/main/java/brooklyn/entity/machine/MachineEntity.java index 6aadd45..bfa884d 100644 --- a/software/base/src/main/java/brooklyn/entity/machine/MachineEntity.java +++ b/software/base/src/main/java/brooklyn/entity/machine/MachineEntity.java @@ -18,12 +18,13 @@ */ package brooklyn.entity.machine; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.MethodEffector; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/software/base/src/main/java/brooklyn/entity/pool/ServerPool.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/pool/ServerPool.java b/software/base/src/main/java/brooklyn/entity/pool/ServerPool.java index 95fb699..1198513 100644 --- a/software/base/src/main/java/brooklyn/entity/pool/ServerPool.java +++ b/software/base/src/main/java/brooklyn/entity/pool/ServerPool.java @@ -23,17 +23,18 @@ import java.util.Map; import com.google.common.annotations.Beta; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.catalog.Catalog; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.machine.MachineEntity; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.MachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 6451222..49478e5 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,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.LocationManager; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.policy.PolicySpec; @@ -29,7 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 a881ca0..7bbbc76 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.api.entity.Entity; import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +35,6 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import brooklyn.entity.Entity; import brooklyn.location.Location; import brooklyn.location.LocationRegistry; import brooklyn.location.LocationResolver.EnableableLocationResolver;
