http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java b/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java index baf4fa4..46bdbf8 100644 --- a/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java +++ b/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java @@ -26,8 +26,8 @@ import java.util.concurrent.ExecutionException; import org.apache.brooklyn.api.entity.Effector; 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 brooklyn.catalog.internal.CatalogInitialization; import brooklyn.config.BrooklynProperties;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/management/internal/ManagementTransitionInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/ManagementTransitionInfo.java b/core/src/main/java/brooklyn/management/internal/ManagementTransitionInfo.java index 4bccd00..c16ff8e 100644 --- a/core/src/main/java/brooklyn/management/internal/ManagementTransitionInfo.java +++ b/core/src/main/java/brooklyn/management/internal/ManagementTransitionInfo.java @@ -18,7 +18,7 @@ */ package brooklyn.management.internal; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; /** Stores a management transition mode, and the management context. */ // TODO does this class really pull its weight? http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/management/internal/NonDeploymentAccessManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/NonDeploymentAccessManager.java b/core/src/main/java/brooklyn/management/internal/NonDeploymentAccessManager.java index ebb31f2..4cc6bba 100644 --- a/core/src/main/java/brooklyn/management/internal/NonDeploymentAccessManager.java +++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentAccessManager.java @@ -18,7 +18,7 @@ */ package brooklyn.management.internal; -import org.apache.brooklyn.management.AccessController; +import org.apache.brooklyn.api.management.AccessController; public class NonDeploymentAccessManager implements AccessManager { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java b/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java index 83f98dd..3928847 100644 --- a/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java +++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java @@ -26,7 +26,7 @@ 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.entity.proxying.EntityTypeRegistry; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.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/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java b/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java index 03d1a0b..97c10c7 100644 --- a/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java +++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.location.Location; import brooklyn.location.LocationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java b/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java index 6ce7bd9..cb0e9ef 100644 --- a/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java +++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java @@ -42,19 +42,19 @@ import org.apache.brooklyn.api.entity.rebind.ChangeListener; import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.api.entity.rebind.RebindManager; -import org.apache.brooklyn.management.AccessController; -import org.apache.brooklyn.management.EntityManager; -import org.apache.brooklyn.management.ExecutionContext; -import org.apache.brooklyn.management.ExecutionManager; -import org.apache.brooklyn.management.LocationManager; -import org.apache.brooklyn.management.SubscriptionContext; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.entitlement.EntitlementManager; -import org.apache.brooklyn.management.ha.HighAvailabilityManager; -import org.apache.brooklyn.management.ha.HighAvailabilityMode; -import org.apache.brooklyn.management.ha.ManagementNodeState; -import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; -import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecordPersister; +import org.apache.brooklyn.api.management.AccessController; +import org.apache.brooklyn.api.management.EntityManager; +import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.api.management.ExecutionManager; +import org.apache.brooklyn.api.management.LocationManager; +import org.apache.brooklyn.api.management.SubscriptionContext; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.entitlement.EntitlementManager; +import org.apache.brooklyn.api.management.ha.HighAvailabilityManager; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister; import org.apache.brooklyn.mementos.BrooklynMementoPersister; import org.apache.brooklyn.mementos.BrooklynMementoRawData; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/management/internal/QueueingSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/QueueingSubscriptionManager.java b/core/src/main/java/brooklyn/management/internal/QueueingSubscriptionManager.java index 3a88906..fb232ad 100644 --- a/core/src/main/java/brooklyn/management/internal/QueueingSubscriptionManager.java +++ b/core/src/main/java/brooklyn/management/internal/QueueingSubscriptionManager.java @@ -28,7 +28,7 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; -import org.apache.brooklyn.management.SubscriptionHandle; +import org.apache.brooklyn.api.management.SubscriptionHandle; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/management/internal/Subscription.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/Subscription.java b/core/src/main/java/brooklyn/management/internal/Subscription.java index 1e1eae1..f8409cb 100644 --- a/core/src/main/java/brooklyn/management/internal/Subscription.java +++ b/core/src/main/java/brooklyn/management/internal/Subscription.java @@ -24,7 +24,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; -import org.apache.brooklyn.management.SubscriptionHandle; +import org.apache.brooklyn.api.management.SubscriptionHandle; import brooklyn.util.text.Identifiers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/management/internal/SubscriptionTracker.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/SubscriptionTracker.java b/core/src/main/java/brooklyn/management/internal/SubscriptionTracker.java index 8003cb2..ec86fae 100644 --- a/core/src/main/java/brooklyn/management/internal/SubscriptionTracker.java +++ b/core/src/main/java/brooklyn/management/internal/SubscriptionTracker.java @@ -24,8 +24,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEventListener; -import org.apache.brooklyn.management.SubscriptionContext; -import org.apache.brooklyn.management.SubscriptionHandle; +import org.apache.brooklyn.api.management.SubscriptionContext; +import org.apache.brooklyn.api.management.SubscriptionHandle; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java b/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java index 9decd71..1471c07 100644 --- a/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java +++ b/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java @@ -35,10 +35,10 @@ import org.apache.brooklyn.api.entity.trait.Configurable; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEventListener; -import org.apache.brooklyn.management.ExecutionContext; -import org.apache.brooklyn.management.SubscriptionContext; -import org.apache.brooklyn.management.SubscriptionHandle; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.api.management.SubscriptionContext; +import org.apache.brooklyn.api.management.SubscriptionHandle; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.policy.EntityAdjunct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/policy/basic/ConfigMapImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/policy/basic/ConfigMapImpl.java b/core/src/main/java/brooklyn/policy/basic/ConfigMapImpl.java index ea15e52..825720a 100644 --- a/core/src/main/java/brooklyn/policy/basic/ConfigMapImpl.java +++ b/core/src/main/java/brooklyn/policy/basic/ConfigMapImpl.java @@ -24,7 +24,7 @@ import java.util.Collections; import java.util.Map; import org.apache.brooklyn.api.entity.basic.EntityLocal; -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/core/src/main/java/brooklyn/util/ResourceUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/ResourceUtils.java b/core/src/main/java/brooklyn/util/ResourceUtils.java index 74fed39..a39f363 100644 --- a/core/src/main/java/brooklyn/util/ResourceUtils.java +++ b/core/src/main/java/brooklyn/util/ResourceUtils.java @@ -38,8 +38,8 @@ import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.auth.Credentials; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/file/ArchiveTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/file/ArchiveTasks.java b/core/src/main/java/brooklyn/util/file/ArchiveTasks.java index 1134fc5..9c6ed2f 100644 --- a/core/src/main/java/brooklyn/util/file/ArchiveTasks.java +++ b/core/src/main/java/brooklyn/util/file/ArchiveTasks.java @@ -20,8 +20,8 @@ package brooklyn.util.file; import java.util.Map; -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.location.basic.SshMachineLocation; import brooklyn.util.ResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/internal/ConfigKeySelfExtracting.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/internal/ConfigKeySelfExtracting.java b/core/src/main/java/brooklyn/util/internal/ConfigKeySelfExtracting.java index a6f16ef..5048b0e 100644 --- a/core/src/main/java/brooklyn/util/internal/ConfigKeySelfExtracting.java +++ b/core/src/main/java/brooklyn/util/internal/ConfigKeySelfExtracting.java @@ -20,7 +20,7 @@ package brooklyn.util.internal; import java.util.Map; -import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.api.management.ExecutionContext; import brooklyn.config.ConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/mutex/SemaphoreForTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/mutex/SemaphoreForTasks.java b/core/src/main/java/brooklyn/util/mutex/SemaphoreForTasks.java index 2333968..5bdfdfa 100644 --- a/core/src/main/java/brooklyn/util/mutex/SemaphoreForTasks.java +++ b/core/src/main/java/brooklyn/util/mutex/SemaphoreForTasks.java @@ -21,8 +21,8 @@ package brooklyn.util.mutex; import java.util.List; import java.util.Set; -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 brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/AbstractExecutionContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/AbstractExecutionContext.java b/core/src/main/java/brooklyn/util/task/AbstractExecutionContext.java index 750d5aa..f3511d7 100644 --- a/core/src/main/java/brooklyn/util/task/AbstractExecutionContext.java +++ b/core/src/main/java/brooklyn/util/task/AbstractExecutionContext.java @@ -21,10 +21,10 @@ package brooklyn.util.task; import java.util.Map; import java.util.concurrent.Callable; -import org.apache.brooklyn.management.ExecutionContext; -import org.apache.brooklyn.management.ExecutionManager; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.api.management.ExecutionManager; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.TaskAdaptable; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/BasicExecutionContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/BasicExecutionContext.java b/core/src/main/java/brooklyn/util/task/BasicExecutionContext.java index 58d9d91..3a41fb2 100644 --- a/core/src/main/java/brooklyn/util/task/BasicExecutionContext.java +++ b/core/src/main/java/brooklyn/util/task/BasicExecutionContext.java @@ -30,12 +30,12 @@ import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.ExecutionContext; -import org.apache.brooklyn.management.ExecutionManager; -import org.apache.brooklyn.management.HasTaskChildren; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskAdaptable; -import org.apache.brooklyn.management.entitlement.EntitlementContext; +import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.api.management.ExecutionManager; +import org.apache.brooklyn.api.management.HasTaskChildren; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.TaskAdaptable; +import org.apache.brooklyn.api.management.entitlement.EntitlementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/BasicExecutionManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/BasicExecutionManager.java b/core/src/main/java/brooklyn/util/task/BasicExecutionManager.java index 7b3c954..c472132 100644 --- a/core/src/main/java/brooklyn/util/task/BasicExecutionManager.java +++ b/core/src/main/java/brooklyn/util/task/BasicExecutionManager.java @@ -45,10 +45,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.brooklyn.management.ExecutionManager; -import org.apache.brooklyn.management.HasTaskChildren; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.api.management.ExecutionManager; +import org.apache.brooklyn.api.management.HasTaskChildren; +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/core/src/main/java/brooklyn/util/task/BasicTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/BasicTask.java b/core/src/main/java/brooklyn/util/task/BasicTask.java index 6b1f82f..57b2bb2 100644 --- a/core/src/main/java/brooklyn/util/task/BasicTask.java +++ b/core/src/main/java/brooklyn/util/task/BasicTask.java @@ -42,8 +42,8 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.apache.brooklyn.management.HasTaskChildren; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.HasTaskChildren; +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/core/src/main/java/brooklyn/util/task/CompoundTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/CompoundTask.java b/core/src/main/java/brooklyn/util/task/CompoundTask.java index d57c508..81f865d 100644 --- a/core/src/main/java/brooklyn/util/task/CompoundTask.java +++ b/core/src/main/java/brooklyn/util/task/CompoundTask.java @@ -28,9 +28,9 @@ import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; -import org.apache.brooklyn.management.HasTaskChildren; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.api.management.HasTaskChildren; +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/core/src/main/java/brooklyn/util/task/DynamicSequentialTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/DynamicSequentialTask.java b/core/src/main/java/brooklyn/util/task/DynamicSequentialTask.java index 22ba5db..a58a05a 100644 --- a/core/src/main/java/brooklyn/util/task/DynamicSequentialTask.java +++ b/core/src/main/java/brooklyn/util/task/DynamicSequentialTask.java @@ -28,9 +28,9 @@ import java.util.Queue; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentLinkedQueue; -import org.apache.brooklyn.management.HasTaskChildren; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskQueueingContext; +import org.apache.brooklyn.api.management.HasTaskChildren; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.TaskQueueingContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/DynamicTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/DynamicTasks.java b/core/src/main/java/brooklyn/util/task/DynamicTasks.java index 88d3471..9d552c6 100644 --- a/core/src/main/java/brooklyn/util/task/DynamicTasks.java +++ b/core/src/main/java/brooklyn/util/task/DynamicTasks.java @@ -22,12 +22,12 @@ import java.util.List; import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.ExecutionContext; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskAdaptable; -import org.apache.brooklyn.management.TaskFactory; -import org.apache.brooklyn.management.TaskQueueingContext; -import org.apache.brooklyn.management.TaskWrapper; +import org.apache.brooklyn.api.management.ExecutionContext; +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.api.management.TaskQueueingContext; +import org.apache.brooklyn.api.management.TaskWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -244,31 +244,31 @@ public class DynamicTasks { } } - /** @see #queue(org.apache.brooklyn.management.TaskAdaptable) */ + /** @see #queue(org.apache.brooklyn.api.management.TaskAdaptable) */ public static void queue(TaskAdaptable<?> task1, TaskAdaptable<?> task2, TaskAdaptable<?> ...tasks) { queue(task1); queue(task2); for (TaskAdaptable<?> task: tasks) queue(task); } - /** @see #queue(org.apache.brooklyn.management.TaskAdaptable) */ + /** @see #queue(org.apache.brooklyn.api.management.TaskAdaptable) */ public static <T extends TaskAdaptable<?>> T queue(TaskFactory<T> taskFactory) { return queue(taskFactory.newTask()); } - /** @see #queue(org.apache.brooklyn.management.TaskAdaptable) */ + /** @see #queue(org.apache.brooklyn.api.management.TaskAdaptable) */ public static void queue(TaskFactory<?> task1, TaskFactory<?> task2, TaskFactory<?> ...tasks) { queue(task1.newTask()); queue(task2.newTask()); for (TaskFactory<?> task: tasks) queue(task.newTask()); } - /** @see #queue(org.apache.brooklyn.management.TaskAdaptable) */ + /** @see #queue(org.apache.brooklyn.api.management.TaskAdaptable) */ public static <T> Task<T> queue(String name, Callable<T> job) { return DynamicTasks.queue(Tasks.<T>builder().name(name).body(job).build()); } - /** @see #queue(org.apache.brooklyn.management.TaskAdaptable) */ + /** @see #queue(org.apache.brooklyn.api.management.TaskAdaptable) */ public static <T> Task<T> queue(String name, Runnable job) { return DynamicTasks.queue(Tasks.<T>builder().name(name).body(job).build()); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/ExecutionListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/ExecutionListener.java b/core/src/main/java/brooklyn/util/task/ExecutionListener.java index 7046ae4..7753588 100644 --- a/core/src/main/java/brooklyn/util/task/ExecutionListener.java +++ b/core/src/main/java/brooklyn/util/task/ExecutionListener.java @@ -18,7 +18,7 @@ */ package brooklyn.util.task; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; public interface ExecutionListener { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/ForwardingTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/ForwardingTask.java b/core/src/main/java/brooklyn/util/task/ForwardingTask.java index 9c0e439..3bc3427 100644 --- a/core/src/main/java/brooklyn/util/task/ForwardingTask.java +++ b/core/src/main/java/brooklyn/util/task/ForwardingTask.java @@ -26,7 +26,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/ParallelTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/ParallelTask.java b/core/src/main/java/brooklyn/util/task/ParallelTask.java index 38c8944..d6e65ab 100644 --- a/core/src/main/java/brooklyn/util/task/ParallelTask.java +++ b/core/src/main/java/brooklyn/util/task/ParallelTask.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/ScheduledTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/ScheduledTask.java b/core/src/main/java/brooklyn/util/task/ScheduledTask.java index cabbc93..eabff49 100644 --- a/core/src/main/java/brooklyn/util/task/ScheduledTask.java +++ b/core/src/main/java/brooklyn/util/task/ScheduledTask.java @@ -28,7 +28,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import brooklyn.util.collections.MutableMap; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/SequentialTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/SequentialTask.java b/core/src/main/java/brooklyn/util/task/SequentialTask.java index 9e33106..e739eb0 100644 --- a/core/src/main/java/brooklyn/util/task/SequentialTask.java +++ b/core/src/main/java/brooklyn/util/task/SequentialTask.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/SingleThreadedScheduler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/SingleThreadedScheduler.java b/core/src/main/java/brooklyn/util/task/SingleThreadedScheduler.java index 2518d51..a48bac8 100644 --- a/core/src/main/java/brooklyn/util/task/SingleThreadedScheduler.java +++ b/core/src/main/java/brooklyn/util/task/SingleThreadedScheduler.java @@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; -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/core/src/main/java/brooklyn/util/task/TaskBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/TaskBuilder.java b/core/src/main/java/brooklyn/util/task/TaskBuilder.java index 35585cf..ecd4d4f 100644 --- a/core/src/main/java/brooklyn/util/task/TaskBuilder.java +++ b/core/src/main/java/brooklyn/util/task/TaskBuilder.java @@ -24,10 +24,10 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.Callable; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskAdaptable; -import org.apache.brooklyn.management.TaskFactory; -import org.apache.brooklyn.management.TaskQueueingContext; +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.api.management.TaskQueueingContext; import brooklyn.util.JavaGroovyEquivalents; import brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/TaskInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/TaskInternal.java b/core/src/main/java/brooklyn/util/task/TaskInternal.java index 3f3d697..51dbddb 100644 --- a/core/src/main/java/brooklyn/util/task/TaskInternal.java +++ b/core/src/main/java/brooklyn/util/task/TaskInternal.java @@ -23,8 +23,8 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -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.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/TaskScheduler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/TaskScheduler.java b/core/src/main/java/brooklyn/util/task/TaskScheduler.java index 43b7386..a10e63a 100644 --- a/core/src/main/java/brooklyn/util/task/TaskScheduler.java +++ b/core/src/main/java/brooklyn/util/task/TaskScheduler.java @@ -22,7 +22,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; /** * The scheduler is an internal mechanism to decorate {@link Task}s. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/TaskTags.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/TaskTags.java b/core/src/main/java/brooklyn/util/task/TaskTags.java index 01ebd05..a9da252 100644 --- a/core/src/main/java/brooklyn/util/task/TaskTags.java +++ b/core/src/main/java/brooklyn/util/task/TaskTags.java @@ -22,8 +22,8 @@ import java.util.Set; import javax.annotation.Nullable; -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 com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/Tasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/Tasks.java b/core/src/main/java/brooklyn/util/task/Tasks.java index 0011b48..c25dd19 100644 --- a/core/src/main/java/brooklyn/util/task/Tasks.java +++ b/core/src/main/java/brooklyn/util/task/Tasks.java @@ -27,12 +27,12 @@ import java.util.concurrent.FutureTask; import javax.annotation.Nullable; -import org.apache.brooklyn.management.ExecutionContext; -import org.apache.brooklyn.management.HasTaskChildren; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskAdaptable; -import org.apache.brooklyn.management.TaskFactory; -import org.apache.brooklyn.management.TaskQueueingContext; +import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.api.management.HasTaskChildren; +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.api.management.TaskQueueingContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/ValueResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/ValueResolver.java b/core/src/main/java/brooklyn/util/task/ValueResolver.java index 1eca284..37f4269 100644 --- a/core/src/main/java/brooklyn/util/task/ValueResolver.java +++ b/core/src/main/java/brooklyn/util/task/ValueResolver.java @@ -26,9 +26,9 @@ import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.ExecutionContext; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.api.management.ExecutionContext; +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/core/src/main/java/brooklyn/util/task/ssh/SshFetchTaskFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/ssh/SshFetchTaskFactory.java b/core/src/main/java/brooklyn/util/task/ssh/SshFetchTaskFactory.java index 374d066..31f654c 100644 --- a/core/src/main/java/brooklyn/util/task/ssh/SshFetchTaskFactory.java +++ b/core/src/main/java/brooklyn/util/task/ssh/SshFetchTaskFactory.java @@ -18,7 +18,7 @@ */ package brooklyn.util.task.ssh; -import org.apache.brooklyn.management.TaskFactory; +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/core/src/main/java/brooklyn/util/task/ssh/SshFetchTaskWrapper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/ssh/SshFetchTaskWrapper.java b/core/src/main/java/brooklyn/util/task/ssh/SshFetchTaskWrapper.java index 2e49fb1..1d265dc 100644 --- a/core/src/main/java/brooklyn/util/task/ssh/SshFetchTaskWrapper.java +++ b/core/src/main/java/brooklyn/util/task/ssh/SshFetchTaskWrapper.java @@ -22,8 +22,8 @@ import java.io.File; import java.io.IOException; import java.util.concurrent.Callable; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskWrapper; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.TaskWrapper; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/ssh/SshPutTaskFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/ssh/SshPutTaskFactory.java b/core/src/main/java/brooklyn/util/task/ssh/SshPutTaskFactory.java index fdba1e0..381341a 100644 --- a/core/src/main/java/brooklyn/util/task/ssh/SshPutTaskFactory.java +++ b/core/src/main/java/brooklyn/util/task/ssh/SshPutTaskFactory.java @@ -21,7 +21,7 @@ package brooklyn.util.task.ssh; import java.io.InputStream; import java.io.Reader; -import org.apache.brooklyn.management.TaskFactory; +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/core/src/main/java/brooklyn/util/task/ssh/SshPutTaskWrapper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/ssh/SshPutTaskWrapper.java b/core/src/main/java/brooklyn/util/task/ssh/SshPutTaskWrapper.java index ac542ad..4f0cd76 100644 --- a/core/src/main/java/brooklyn/util/task/ssh/SshPutTaskWrapper.java +++ b/core/src/main/java/brooklyn/util/task/ssh/SshPutTaskWrapper.java @@ -21,8 +21,8 @@ package brooklyn.util.task.ssh; import java.util.Arrays; import java.util.concurrent.Callable; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskWrapper; +import org.apache.brooklyn.api.management.Task; +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/core/src/main/java/brooklyn/util/task/ssh/SshTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/ssh/SshTasks.java b/core/src/main/java/brooklyn/util/task/ssh/SshTasks.java index 4ad8512..bf01bfe 100644 --- a/core/src/main/java/brooklyn/util/task/ssh/SshTasks.java +++ b/core/src/main/java/brooklyn/util/task/ssh/SshTasks.java @@ -23,11 +23,11 @@ import java.util.Map; import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskAdaptable; -import org.apache.brooklyn.management.TaskFactory; -import org.apache.brooklyn.management.TaskQueueingContext; +import org.apache.brooklyn.api.management.ManagementContext; +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.api.management.TaskQueueingContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/system/ProcessTaskFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/system/ProcessTaskFactory.java b/core/src/main/java/brooklyn/util/task/system/ProcessTaskFactory.java index 363467b..f43e47a 100644 --- a/core/src/main/java/brooklyn/util/task/system/ProcessTaskFactory.java +++ b/core/src/main/java/brooklyn/util/task/system/ProcessTaskFactory.java @@ -20,7 +20,7 @@ package brooklyn.util.task.system; import java.util.Map; -import org.apache.brooklyn.management.TaskFactory; +import org.apache.brooklyn.api.management.TaskFactory; import brooklyn.config.ConfigKey; import brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/util/task/system/ProcessTaskWrapper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/task/system/ProcessTaskWrapper.java b/core/src/main/java/brooklyn/util/task/system/ProcessTaskWrapper.java index 3be6c30..5c18fdd 100644 --- a/core/src/main/java/brooklyn/util/task/system/ProcessTaskWrapper.java +++ b/core/src/main/java/brooklyn/util/task/system/ProcessTaskWrapper.java @@ -21,8 +21,8 @@ package brooklyn.util.task.system; import java.io.ByteArrayOutputStream; import java.util.concurrent.Callable; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskWrapper; +import org.apache.brooklyn.api.management.Task; +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/core/src/main/java/brooklyn/util/text/TemplateProcessor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/text/TemplateProcessor.java b/core/src/main/java/brooklyn/util/text/TemplateProcessor.java index 2491a81..8fdaebb 100644 --- a/core/src/main/java/brooklyn/util/text/TemplateProcessor.java +++ b/core/src/main/java/brooklyn/util/text/TemplateProcessor.java @@ -28,7 +28,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.drivers.EntityDriver; import org.apache.brooklyn.api.event.AttributeSensor; -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/core/src/test/java/brooklyn/camp/lite/CampPlatformWithJustBrooklynMgmt.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/camp/lite/CampPlatformWithJustBrooklynMgmt.java b/core/src/test/java/brooklyn/camp/lite/CampPlatformWithJustBrooklynMgmt.java index 70f749b..3fad07e 100644 --- a/core/src/test/java/brooklyn/camp/lite/CampPlatformWithJustBrooklynMgmt.java +++ b/core/src/test/java/brooklyn/camp/lite/CampPlatformWithJustBrooklynMgmt.java @@ -18,7 +18,7 @@ */ package brooklyn.camp.lite; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import io.brooklyn.camp.BasicCampPlatform; import brooklyn.camp.brooklyn.api.HasBrooklynManagementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java b/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java index 170ad45..0917b0e 100644 --- a/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java +++ b/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java @@ -21,7 +21,6 @@ package brooklyn.camp.lite; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; @@ -49,6 +48,7 @@ import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.catalog.CatalogItem.CatalogBundle; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.management.Task; import brooklyn.catalog.CatalogPredicates; import brooklyn.catalog.internal.BasicBrooklynCatalog; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java b/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java index 5a6a0b7..22d3ab8 100644 --- a/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java +++ b/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java @@ -30,8 +30,8 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; 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/core/src/test/java/brooklyn/catalog/internal/CatalogTestUtils.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/catalog/internal/CatalogTestUtils.java b/core/src/test/java/brooklyn/catalog/internal/CatalogTestUtils.java index c0e8bc9..b420860 100644 --- a/core/src/test/java/brooklyn/catalog/internal/CatalogTestUtils.java +++ b/core/src/test/java/brooklyn/catalog/internal/CatalogTestUtils.java @@ -20,8 +20,8 @@ package brooklyn.catalog.internal; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java b/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java index c8dc960..345e7c1 100644 --- a/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; -import org.apache.brooklyn.management.SubscriptionContext; +import org.apache.brooklyn.api.management.SubscriptionContext; import org.apache.brooklyn.policy.EnricherSpec; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricherTest.java b/core/src/test/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricherTest.java index e6c42ce..9dc4545 100644 --- a/core/src/test/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricherTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; -import org.apache.brooklyn.management.SubscriptionContext; +import org.apache.brooklyn.api.management.SubscriptionContext; import org.apache.brooklyn.policy.EnricherSpec; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy b/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy index a57637b..5ce49a2 100644 --- a/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy +++ b/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy @@ -39,8 +39,8 @@ import brooklyn.entity.trait.Startable import org.apache.brooklyn.api.entity.Effector; 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 brooklyn.management.internal.EffectorUtils http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java b/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java index a806b17..0505456 100644 --- a/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java +++ b/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java @@ -31,8 +31,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.ParameterType; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -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.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/EntityPreManagementTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/EntityPreManagementTest.java b/core/src/test/java/brooklyn/entity/EntityPreManagementTest.java index 42564db..c29682e 100644 --- a/core/src/test/java/brooklyn/entity/EntityPreManagementTest.java +++ b/core/src/test/java/brooklyn/entity/EntityPreManagementTest.java @@ -25,8 +25,8 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; -import org.apache.brooklyn.management.EntityManager; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.EntityManager; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.TestUtils; 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/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java b/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java index cd20d06..ef49562 100644 --- a/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java +++ b/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java @@ -27,8 +27,8 @@ import java.util.concurrent.atomic.AtomicReference; 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.basic.RecordingSensorEventListener; -import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; 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/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java b/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java index a45ef14..a532d15 100644 --- a/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java +++ b/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java @@ -33,8 +33,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.entity.Entity; -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 org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java b/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java index 9aac7ff..1f9c706 100644 --- a/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java +++ b/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; -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/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java b/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java index 9334466..2919055 100644 --- a/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java +++ b/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java @@ -30,7 +30,7 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java b/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java index 6bb9637..4878e33 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java @@ -21,7 +21,7 @@ package brooklyn.entity.basic; import static org.testng.Assert.assertEquals; 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.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.java b/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.java index 12be9ce..6b0a91b 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.java @@ -22,8 +22,8 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.management.SubscriptionHandle; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; -import org.apache.brooklyn.management.SubscriptionHandle; 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/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java b/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java index f2ee1fe..aa57db3 100644 --- a/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java @@ -21,7 +21,7 @@ package brooklyn.entity.drivers; import static org.testng.Assert.assertTrue; import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java b/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java index 03f01d6..5d561bc 100644 --- a/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java +++ b/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java @@ -23,8 +23,8 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.HasTaskChildren; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.HasTaskChildren; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.test.TestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java b/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java index 45c9a43..56382d8 100644 --- a/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java +++ b/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java @@ -28,8 +28,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.Entity; -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 org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestApplicationImpl; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java b/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java index 9985da6..38dd2b8 100644 --- a/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java +++ b/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java @@ -24,8 +24,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.proxying.EntitySpec; -import org.apache.brooklyn.management.HasTaskChildren; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.HasTaskChildren; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java b/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java index 3d3023c..5e16db6 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java @@ -54,8 +54,8 @@ import brooklyn.entity.basic.Lifecycle; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.SensorEvent; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; -import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java b/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java index ccf338a..5289855 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicLong; 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.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java b/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java index 820728c..4e3098d 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java @@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicInteger; 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.Task; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.test.TestUtils; import org.apache.brooklyn.test.entity.BlockingEntity; import org.apache.brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java b/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java index 0e120e1..dd5ce7f 100644 --- a/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java +++ b/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java @@ -28,7 +28,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.Sensor; -import org.apache.brooklyn.management.EntityManager; +import org.apache.brooklyn.api.management.EntityManager; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java b/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java index 71e3ca7..18b1ea3 100644 --- a/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java +++ b/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java @@ -37,8 +37,8 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; -import org.apache.brooklyn.management.EntityManager; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.EntityManager; +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/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java b/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java index 1fbfe38..3d3573e 100644 --- a/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java @@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicReference; 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.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.apache.brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java b/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java index 91756dc..6ec8e9f 100644 --- a/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java @@ -23,7 +23,7 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.EntityManager; +import org.apache.brooklyn.api.management.EntityManager; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java b/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java index 8a0562a..fea7058 100644 --- a/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java @@ -28,8 +28,8 @@ import java.util.Set; 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.management.EntityManager; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.EntityManager; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java index 14ed8f5..7856be7 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java @@ -43,8 +43,8 @@ import brooklyn.management.internal.LocalManagementContext; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.test.TestResourceUnavailableException; import brooklyn.util.javalang.UrlClassLoader; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java index 0c0dc43..fe15c77 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java @@ -39,7 +39,7 @@ import brooklyn.camp.lite.TestAppAssemblyInstantiator; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.catalog.CatalogItem.CatalogItemType; 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.TestEntity; import brooklyn.catalog.internal.BasicBrooklynCatalog; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java index 4ae3386..84c61bc 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java @@ -47,7 +47,7 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.event.AttributeSensor.SensorPersistenceMode; -import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.mementos.BrooklynMementoManifest; import org.apache.brooklyn.mementos.EntityMemento; import org.apache.brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java index 39760b7..1775832 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java @@ -33,8 +33,8 @@ import org.apache.brooklyn.api.entity.rebind.RebindManager; import org.apache.brooklyn.api.entity.rebind.RebindManager.RebindFailureMode; import org.apache.brooklyn.api.entity.trait.Identifiable; import org.apache.brooklyn.api.event.AttributeSensor; -import org.apache.brooklyn.management.EntityManager; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.EntityManager; +import org.apache.brooklyn.api.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/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java index ce4146e..c3c27c2 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java @@ -28,8 +28,8 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.Feed; 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.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; 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/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java index e0aa57a..b6da363 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java @@ -28,7 +28,7 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.trait.Identifiable; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.mementos.EntityMemento; import org.apache.brooklyn.mementos.TreeNode; import org.apache.brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java index 6b8193c..676d040 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java @@ -24,7 +24,7 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/rebind/RebindOptions.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindOptions.java b/core/src/test/java/brooklyn/entity/rebind/RebindOptions.java index 0682e3c..c513ef5 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindOptions.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindOptions.java @@ -21,7 +21,7 @@ package brooklyn.entity.rebind; import java.io.File; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.entity.rebind.persister.PersistenceObjectStore; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java b/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java index b8489fa..98abee6 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java @@ -36,9 +36,9 @@ import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.api.entity.rebind.RebindManager; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.mementos.BrooklynMementoManifest; import brooklyn.catalog.internal.CatalogUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java b/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java index 4309489..0dac5e5 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java @@ -32,9 +32,9 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.api.entity.trait.Identifiable; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.ha.HighAvailabilityMode; -import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.mementos.BrooklynMemento; import org.apache.brooklyn.mementos.BrooklynMementoRawData; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterFileBasedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterFileBasedTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterFileBasedTest.java index 50b79b7..8ca71e6 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterFileBasedTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterFileBasedTest.java @@ -20,7 +20,7 @@ package brooklyn.entity.rebind.persister; import java.io.File; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java index 5f43e41..7431e36 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java @@ -21,7 +21,7 @@ package brooklyn.entity.rebind.persister; import java.io.IOException; import java.util.concurrent.TimeoutException; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemoryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemoryTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemoryTest.java index 386b521..5b81d88 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemoryTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemoryTest.java @@ -18,7 +18,7 @@ */ package brooklyn.entity.rebind.persister; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.testng.annotations.Test; import brooklyn.entity.rebind.RebindTestUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java index 5db72d8..e87db3b 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java @@ -27,7 +27,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; import org.apache.brooklyn.api.entity.rebind.RebindManager.RebindFailureMode; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.mementos.BrooklynMemento; import org.apache.brooklyn.mementos.BrooklynMementoPersister; import org.apache.brooklyn.mementos.BrooklynMementoRawData; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/rebind/persister/FileBasedObjectStoreTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/FileBasedObjectStoreTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/FileBasedObjectStoreTest.java index 363c097..ef4b707 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/FileBasedObjectStoreTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/FileBasedObjectStoreTest.java @@ -25,7 +25,7 @@ import static org.testng.Assert.assertTrue; import java.io.File; import java.io.FileNotFoundException; -import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/brooklyn/entity/rebind/persister/InMemoryObjectStore.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/InMemoryObjectStore.java b/core/src/test/java/brooklyn/entity/rebind/persister/InMemoryObjectStore.java index ee75b64..fbf8694 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/InMemoryObjectStore.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/InMemoryObjectStore.java @@ -22,8 +22,8 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
