http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 f4026aa..798f9b5 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 @@ -28,9 +28,9 @@ 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.apache.brooklyn.api.management.TaskAdaptable; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 435cd9d..9c3a17b 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 @@ -24,8 +24,8 @@ 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.apache.brooklyn.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 7e74e3b..3817b6b 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 @@ -25,8 +25,8 @@ 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.apache.brooklyn.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 cd66114..2edf67d 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 @@ -19,8 +19,8 @@ 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.brooklyn.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.http.HttpStatus; import brooklyn.entity.brooklynnode.BrooklynNode; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 faccb12..fde4f51 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefAttributeFeed.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefAttributeFeed.java @@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.AttributeSensor; -import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.api.management.ExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 202449c..963ec8e 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefSoloDriver.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefSoloDriver.java @@ -19,8 +19,8 @@ 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 org.apache.brooklyn.api.management.TaskAdaptable; +import org.apache.brooklyn.api.management.TaskFactory; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/chef/ChefSoloTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/chef/ChefSoloTasks.java b/software/base/src/main/java/brooklyn/entity/chef/ChefSoloTasks.java index 161e6fa..342e84b 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefSoloTasks.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefSoloTasks.java @@ -20,7 +20,7 @@ package brooklyn.entity.chef; import java.util.Map; -import org.apache.brooklyn.management.TaskFactory; +import org.apache.brooklyn.api.management.TaskFactory; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.util.ssh.BashCommands; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 042ace4..369df99 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefTasks.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefTasks.java @@ -21,8 +21,8 @@ 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.apache.brooklyn.api.management.TaskAdaptable; +import org.apache.brooklyn.api.management.TaskFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 a2ddd66..e7fb72d 100644 --- a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java +++ b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java @@ -24,8 +24,8 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; -import org.apache.brooklyn.management.LocationManager; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.LocationManager; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 7bbbc76..ba6608b 100644 --- a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocationResolver.java +++ b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocationResolver.java @@ -27,7 +27,7 @@ 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.apache.brooklyn.api.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 6ad438a..354653d 100644 --- a/software/base/src/main/java/brooklyn/entity/service/EntityLaunchListener.java +++ b/software/base/src/main/java/brooklyn/entity/service/EntityLaunchListener.java @@ -26,8 +26,8 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; -import org.apache.brooklyn.management.ExecutionManager; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.ExecutionManager; +import org.apache.brooklyn.api.management.Task; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.BrooklynTaskTags.EffectorCallTag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java b/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java index 391de96..4503ef9 100644 --- a/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java +++ b/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java @@ -25,7 +25,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.trait.HasShortName; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.policy.Enricher; import brooklyn.config.ConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java b/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java index aceca2e..5fe62ea 100644 --- a/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java +++ b/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java @@ -22,8 +22,8 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; -import org.apache.brooklyn.management.ExecutionContext; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.policy.Enricher; import brooklyn.config.ConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/service/SystemServiceInstaller.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/service/SystemServiceInstaller.java b/software/base/src/main/java/brooklyn/entity/service/SystemServiceInstaller.java index c8d4973..ce326af 100644 --- a/software/base/src/main/java/brooklyn/entity/service/SystemServiceInstaller.java +++ b/software/base/src/main/java/brooklyn/entity/service/SystemServiceInstaller.java @@ -18,7 +18,7 @@ */ package brooklyn.entity.service; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; public interface SystemServiceInstaller { Task<?> getServiceInstallTask(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java b/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java index a8421c8..9492fc3 100644 --- a/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java +++ b/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java @@ -21,7 +21,7 @@ package brooklyn.entity.software; import java.util.List; import java.util.concurrent.Callable; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java index cb3ec00..4036f16 100644 --- a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java @@ -30,7 +30,7 @@ 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.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java index 93ea464..9530a6c 100644 --- a/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java @@ -25,7 +25,7 @@ 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.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/software/StaticSensor.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/StaticSensor.java b/software/base/src/main/java/brooklyn/entity/software/StaticSensor.java index 7aacc01..a0c1b82 100644 --- a/software/base/src/main/java/brooklyn/entity/software/StaticSensor.java +++ b/software/base/src/main/java/brooklyn/entity/software/StaticSensor.java @@ -19,7 +19,7 @@ package brooklyn.entity.software; import org.apache.brooklyn.api.entity.basic.EntityLocal; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/software/java/JmxAttributeSensor.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/java/JmxAttributeSensor.java b/software/base/src/main/java/brooklyn/entity/software/java/JmxAttributeSensor.java index bcd27db..b866be3 100644 --- a/software/base/src/main/java/brooklyn/entity/software/java/JmxAttributeSensor.java +++ b/software/base/src/main/java/brooklyn/entity/software/java/JmxAttributeSensor.java @@ -24,7 +24,7 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import org.apache.brooklyn.api.entity.basic.EntityLocal; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java index 0956067..766822b 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java @@ -21,7 +21,7 @@ package brooklyn.entity; import java.util.List; import java.util.Map; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java index 54dc7fb..5ff72d9 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java @@ -21,7 +21,7 @@ package brooklyn.entity; import java.util.List; import java.util.Map; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java b/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java index 115aaf7..2ad2add 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java @@ -24,7 +24,7 @@ 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.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java index 597841a..c408604 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java @@ -27,7 +27,7 @@ import java.util.List; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java index e6084b7..81ad9da 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java @@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger; 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.api.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java index 69e105f..bdbccd2 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java @@ -34,9 +34,9 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.management.EntityManager; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.api.management.EntityManager; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.jclouds.util.Throwables2; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java index 3399b56..df89383 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java index f923b7c..07ee20e 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java @@ -31,7 +31,7 @@ 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.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.http.client.methods.HttpPost; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java b/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java index 1bd966a..4150ec9 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java +++ b/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java @@ -22,7 +22,7 @@ import java.io.File; import java.io.IOException; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java index cdd8454..ff7dfb1 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java @@ -21,7 +21,7 @@ package brooklyn.entity.chef; import java.io.ByteArrayOutputStream; import java.io.IOException; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverToyMySqlEntity.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverToyMySqlEntity.java b/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverToyMySqlEntity.java index e04e4fd..4c33a62 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverToyMySqlEntity.java +++ b/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverToyMySqlEntity.java @@ -18,8 +18,8 @@ */ package brooklyn.entity.chef.mysql; -import org.apache.brooklyn.management.TaskAdaptable; -import org.apache.brooklyn.management.TaskFactory; +import org.apache.brooklyn.api.management.TaskAdaptable; +import org.apache.brooklyn.api.management.TaskFactory; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java b/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java index a0e7ecd..268a7db 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java @@ -23,7 +23,7 @@ import static org.testng.Assert.fail; import java.util.List; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java index 5eda7f9..099a2f2 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java @@ -23,7 +23,7 @@ import static org.testng.Assert.assertTrue; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java index 6f2ec8b..f24ae5f 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java @@ -26,7 +26,7 @@ import java.util.Collection; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java index cc340ad..facc56b 100644 --- a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java @@ -29,7 +29,7 @@ import com.google.common.base.CaseFormat; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java b/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java index 79fc834..7e542ea 100644 --- a/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java @@ -28,7 +28,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java b/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java index a190064..0529262 100644 --- a/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java @@ -21,8 +21,8 @@ package brooklyn.entity.software; import java.util.Arrays; import org.apache.brooklyn.api.entity.Effector; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java b/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java index e0d2c44..c726b44 100644 --- a/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java @@ -22,9 +22,9 @@ import java.io.File; import java.io.IOException; import java.util.Arrays; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.TaskAdaptable; -import org.apache.brooklyn.management.TaskFactory; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.TaskAdaptable; +import org.apache.brooklyn.api.management.TaskFactory; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java index 31c5687..f5ef0a6 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java @@ -22,7 +22,7 @@ import java.io.File; import java.net.InetAddress; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java index 8910ac0..c9db677 100644 --- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java @@ -19,7 +19,7 @@ package brooklyn.entity.database.postgresql; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java index 8e045d4..6d56060 100644 --- a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java @@ -24,7 +24,7 @@ import java.util.Arrays; import java.util.List; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java index fb77ace..8e69af0 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java @@ -29,7 +29,7 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; -import org.apache.brooklyn.management.TaskWrapper; +import org.apache.brooklyn.api.management.TaskWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java index b912213..06634df 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java @@ -31,7 +31,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Group; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.apache.http.auth.UsernamePasswordCredentials; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java index d210bd1..485b3e3 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java @@ -30,7 +30,7 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.event.AttributeSensor; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java index d8b725c..4a099e9 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java @@ -29,10 +29,10 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.api.management.SubscriptionHandle; import org.apache.brooklyn.entity.proxy.AbstractControllerImpl; import org.apache.brooklyn.entity.proxy.ProxySslConfig; import org.apache.brooklyn.entity.proxy.nginx.NginxController.NginxControllerInternal; -import org.apache.brooklyn.management.SubscriptionHandle; import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java index 6c3f222..ef83c73 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.concurrent.atomic.AtomicLong; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.entity.proxy.AbstractController; -import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/UrlMappingImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/UrlMappingImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/UrlMappingImpl.java index b41735d..3d9b5b6 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/UrlMappingImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/UrlMappingImpl.java @@ -28,9 +28,9 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.api.management.SubscriptionHandle; import org.apache.brooklyn.entity.proxy.ProxySslConfig; import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; -import org.apache.brooklyn.management.SubscriptionHandle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java index 465c5f1..51ac064 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java @@ -27,10 +27,10 @@ import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.entity.proxy.LoadBalancer; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; -import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java index 98e83aa..1c87941 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java @@ -27,8 +27,8 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java index 9940987..273d308 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java @@ -27,10 +27,10 @@ import java.util.Map; 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.api.management.ManagementContext; import org.apache.brooklyn.entity.dns.AbstractGeoDnsService; import org.apache.brooklyn.entity.dns.AbstractGeoDnsServiceImpl; import org.apache.brooklyn.entity.dns.AbstractGeoDnsServiceTest; -import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java index cc959df..54dec72 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java @@ -24,9 +24,9 @@ import java.net.InetAddress; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.entity.dns.geoscaling.GeoscalingDnsService; import org.apache.brooklyn.entity.dns.geoscaling.GeoscalingScriptGenerator; -import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java index e9290c5..3037393 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java @@ -26,12 +26,12 @@ import java.util.List; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.management.EntityManager; import org.apache.brooklyn.entity.proxy.LoadBalancerCluster; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.proxy.nginx.UrlMapping; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; -import org.apache.brooklyn.management.EntityManager; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java index 593254e..c025f47 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java @@ -32,11 +32,11 @@ import java.util.concurrent.Executors; 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.api.management.ManagementContext; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.proxy.nginx.UrlMapping; import org.apache.brooklyn.entity.proxy.nginx.UrlRewriteRule; import org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server; -import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.WebAppMonitor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java index bfc05df..d0fcf2f 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java @@ -28,10 +28,10 @@ import java.util.concurrent.Executors; import org.apache.brooklyn.api.entity.Feed; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.WebAppMonitor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java index 7af9cc2..fb43555 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java @@ -33,6 +33,7 @@ import java.util.Set; 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.api.management.EntityManager; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.proxy.nginx.UrlMapping; import org.apache.brooklyn.entity.proxy.nginx.UrlRewriteRule; @@ -41,7 +42,6 @@ import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server; import org.apache.brooklyn.entity.webapp.tomcat.Tomcat8ServerImpl; -import org.apache.brooklyn.management.EntityManager; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java index 1157ecb..8d3a26b 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java @@ -24,11 +24,11 @@ import java.net.URL; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; -import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java index eaedac7..09d69b0 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java @@ -63,13 +63,13 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity; 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.management.SubscriptionContext; +import org.apache.brooklyn.api.management.SubscriptionHandle; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.WebAppServiceMethods; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.SubscriptionContext; -import org.apache.brooklyn.management.SubscriptionHandle; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java index c362c50..fe324e2 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java @@ -23,10 +23,10 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServerImpl; -import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java index 11340cc..b0f4f4e 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java @@ -37,10 +37,10 @@ import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.test.Asserts; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; -import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppFixtureIntegrationTest.java index 10e09f2..c3f1a10 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppFixtureIntegrationTest.java @@ -33,9 +33,9 @@ import com.google.common.collect.ImmutableList; 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.api.management.ManagementContext; import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.nodejs.NodeJsWebAppService; -import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java index b11cade..d70392d 100644 --- a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java +++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java @@ -15,7 +15,7 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.entity.webapp.JavaWebAppService; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.ResourceUtils; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java ---------------------------------------------------------------------- diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java index 7c33d89..9cc42ae 100644 --- a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java +++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java @@ -15,7 +15,7 @@ import brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.WebAppService; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java index f0ae067..e2044c1 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java @@ -22,11 +22,11 @@ import io.brooklyn.camp.AggregatingCampPlatform; import io.brooklyn.camp.CampPlatform; import io.brooklyn.camp.spi.PlatformRootSummary; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext.PropertiesReloadListener; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynEntityMatcher; import org.apache.brooklyn.camp.brooklyn.spi.dsl.BrooklynDslInterpreter; import org.apache.brooklyn.camp.brooklyn.spi.platform.BrooklynImmutableCampPlatform; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.ManagementContext.PropertiesReloadListener; import brooklyn.camp.brooklyn.api.HasBrooklynManagementContext; import brooklyn.config.BrooklynProperties; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java index 1e22e4c..5167481 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatformLauncherAbstract.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.camp.brooklyn; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import io.brooklyn.camp.spi.PlatformRootSummary; import brooklyn.management.internal.LocalManagementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/YamlLauncherAbstract.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/YamlLauncherAbstract.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/YamlLauncherAbstract.java index 719633e..1ad7868 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/YamlLauncherAbstract.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/YamlLauncherAbstract.java @@ -26,8 +26,8 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java index ffac5ab..fe22e89 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java @@ -44,9 +44,9 @@ import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampConstants; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; import brooklyn.catalog.internal.BasicBrooklynCatalog.BrooklynLoaderTracker; import brooklyn.catalog.internal.CatalogUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java index c9ae3b5..dc6e97a 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java @@ -39,12 +39,12 @@ import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampConstants; import org.apache.brooklyn.camp.brooklyn.BrooklynCampReservedKeys; import org.apache.brooklyn.camp.brooklyn.spi.creation.service.BrooklynServiceTypeResolver; import org.apache.brooklyn.camp.brooklyn.spi.creation.service.ServiceTypeResolver; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.config.ConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java index 687bd7f..6437c67 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java @@ -25,9 +25,9 @@ import org.apache.brooklyn.api.catalog.BrooklynCatalog; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.proxying.EntityInitializer; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampReservedKeys; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynYamlTypeInstantiator.InstantiatorFromKey; -import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.Policy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java index 9a0ed06..94dd3d0 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java @@ -27,10 +27,10 @@ import io.brooklyn.camp.spi.resolve.PdpMatcher; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampConstants; import org.apache.brooklyn.camp.brooklyn.BrooklynCampReservedKeys; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlLocationResolver.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlLocationResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlLocationResolver.java index 7274c41..39b1d5f 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlLocationResolver.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlLocationResolver.java @@ -22,7 +22,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.location.Location; import brooklyn.location.LocationDefinition; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlTypeInstantiator.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlTypeInstantiator.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlTypeInstantiator.java index ad11b58..2954ee7 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlTypeInstantiator.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlTypeInstantiator.java @@ -23,8 +23,8 @@ import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampReservedKeys; -import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java index 9ca4baf..3babd31 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java @@ -25,8 +25,8 @@ import io.brooklyn.camp.spi.AssemblyTemplate; import io.brooklyn.camp.spi.resolve.interpret.PlanInterpretationNode; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskFactory; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.TaskFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java index f738298..71a72a5 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java @@ -25,15 +25,15 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.trait.Configurable; import org.apache.brooklyn.api.event.Sensor; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.TaskAdaptable; +import org.apache.brooklyn.api.management.TaskFactory; import org.apache.brooklyn.camp.brooklyn.BrooklynCampReservedKeys; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynYamlTypeInstantiator; import org.apache.brooklyn.camp.brooklyn.spi.creation.EntitySpecConfiguration; import org.apache.brooklyn.camp.brooklyn.spi.dsl.BrooklynDslDeferredSupplier; import org.apache.brooklyn.camp.brooklyn.spi.dsl.DslUtils; import org.apache.brooklyn.camp.brooklyn.spi.dsl.methods.DslComponent.Scope; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskAdaptable; -import org.apache.brooklyn.management.TaskFactory; import org.apache.commons.beanutils.BeanUtils; import brooklyn.entity.basic.EntityDynamicType; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java index 890fdce..086ddaf 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java @@ -25,9 +25,9 @@ import java.util.concurrent.Callable; 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.management.Task; import org.apache.brooklyn.camp.brooklyn.BrooklynCampConstants; import org.apache.brooklyn.camp.brooklyn.spi.dsl.BrooklynDslDeferredSupplier; -import org.apache.brooklyn.management.Task; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractBrooklynResourceLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractBrooklynResourceLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractBrooklynResourceLookup.java index 8828c23..f67f2c9 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractBrooklynResourceLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractBrooklynResourceLookup.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.camp.brooklyn.spi.lookup; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import io.brooklyn.camp.spi.AbstractResource; import io.brooklyn.camp.spi.PlatformRootSummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java index 1c650d0..49cbb6e 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.catalog.CatalogItem; 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.api.management.ManagementContext; import brooklyn.catalog.internal.CatalogUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyBrooklynLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyBrooklynLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyBrooklynLookup.java index ef723c0..ac3e542 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyBrooklynLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyBrooklynLookup.java @@ -28,7 +28,7 @@ import java.util.List; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; public class AssemblyBrooklynLookup extends AbstractBrooklynResourceLookup<Assembly> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java index f0fdf22..5158550 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java @@ -29,8 +29,8 @@ import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynAssemblyTemplateInstantiator; -import org.apache.brooklyn.management.ManagementContext; import brooklyn.catalog.CatalogPredicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/BrooklynUrlLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/BrooklynUrlLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/BrooklynUrlLookup.java index 207e5c8..00f461a 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/BrooklynUrlLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/BrooklynUrlLookup.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.camp.brooklyn.spi.lookup; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys;
