http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java b/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java index 8051aeb..e0f14ab 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java +++ b/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java @@ -32,6 +32,8 @@ import java.util.concurrent.ConcurrentMap; import javax.annotation.Nullable; +import org.apache.brooklyn.management.AccessController; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.Policy; @@ -57,8 +59,6 @@ import brooklyn.entity.proxying.InternalEntityFactory; import brooklyn.entity.proxying.InternalPolicyFactory; import brooklyn.entity.trait.Startable; import brooklyn.internal.storage.BrooklynStorage; -import brooklyn.management.AccessController; -import brooklyn.management.Task; import brooklyn.util.collections.MutableSet; import brooklyn.util.collections.SetFromLiveMap; import brooklyn.util.exceptions.Exceptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java b/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java index 7d179b6..31d90fc 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java +++ b/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java @@ -25,6 +25,7 @@ import java.util.Collection; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; +import org.apache.brooklyn.management.AccessController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +41,6 @@ import brooklyn.location.LocationSpec; import brooklyn.location.ProvisioningLocation; import brooklyn.location.basic.AbstractLocation; import brooklyn.location.basic.LocationInternal; -import brooklyn.management.AccessController; import brooklyn.management.entitlement.Entitlements; import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/internal/LocalManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/LocalManagementContext.java b/core/src/main/java/brooklyn/management/internal/LocalManagementContext.java index d0750f4..ac98c13 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalManagementContext.java +++ b/core/src/main/java/brooklyn/management/internal/LocalManagementContext.java @@ -31,6 +31,13 @@ import java.util.WeakHashMap; import java.util.concurrent.Callable; import java.util.concurrent.CopyOnWriteArrayList; +import org.apache.brooklyn.management.AccessController; +import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.management.ExecutionManager; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.SubscriptionManager; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,13 +54,6 @@ import brooklyn.entity.proxying.InternalPolicyFactory; import brooklyn.internal.BrooklynFeatureEnablement; import brooklyn.internal.storage.DataGridFactory; import brooklyn.location.Location; -import brooklyn.management.AccessController; -import brooklyn.management.ExecutionContext; -import brooklyn.management.ExecutionManager; -import brooklyn.management.ManagementContext; -import brooklyn.management.SubscriptionManager; -import brooklyn.management.Task; -import brooklyn.management.TaskAdaptable; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.ha.OsgiManager; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/internal/LocalSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/LocalSubscriptionManager.java b/core/src/main/java/brooklyn/management/internal/LocalSubscriptionManager.java index 7121fc3..c6c096b 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalSubscriptionManager.java +++ b/core/src/main/java/brooklyn/management/internal/LocalSubscriptionManager.java @@ -33,6 +33,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; +import org.apache.brooklyn.management.ExecutionManager; +import org.apache.brooklyn.management.SubscriptionHandle; +import org.apache.brooklyn.management.SubscriptionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,9 +44,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.management.ExecutionManager; -import brooklyn.management.SubscriptionHandle; -import brooklyn.management.SubscriptionManager; import brooklyn.util.task.BasicExecutionManager; import brooklyn.util.task.SingleThreadedScheduler; import brooklyn.util.text.Identifiers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/internal/LocalUsageManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/LocalUsageManager.java b/core/src/main/java/brooklyn/management/internal/LocalUsageManager.java index 305266f..4619cb7 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalUsageManager.java +++ b/core/src/main/java/brooklyn/management/internal/LocalUsageManager.java @@ -31,6 +31,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.management.entitlement.EntitlementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +46,6 @@ import brooklyn.location.basic.AbstractLocation; import brooklyn.location.basic.LocationConfigKeys; import brooklyn.location.basic.LocationInternal; import brooklyn.management.ManagementContextInjectable; -import brooklyn.management.entitlement.EntitlementContext; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.usage.ApplicationUsage; import brooklyn.management.usage.LocationUsage; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/internal/LocationManagerInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/LocationManagerInternal.java b/core/src/main/java/brooklyn/management/internal/LocationManagerInternal.java index 4b0d959..7f3a18b 100644 --- a/core/src/main/java/brooklyn/management/internal/LocationManagerInternal.java +++ b/core/src/main/java/brooklyn/management/internal/LocationManagerInternal.java @@ -18,8 +18,9 @@ */ package brooklyn.management.internal; +import org.apache.brooklyn.management.LocationManager; + import brooklyn.location.Location; -import brooklyn.management.LocationManager; public interface LocationManagerInternal extends LocationManager, BrooklynObjectManagerInternal<Location> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 20f9113..1a3516c 100644 --- a/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java +++ b/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java @@ -24,6 +24,9 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; + import brooklyn.catalog.internal.CatalogInitialization; import brooklyn.config.BrooklynProperties; import brooklyn.entity.Effector; @@ -34,8 +37,6 @@ import brooklyn.entity.proxying.InternalLocationFactory; import brooklyn.entity.proxying.InternalPolicyFactory; import brooklyn.internal.storage.BrooklynStorage; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; import brooklyn.management.ha.OsgiManager; import brooklyn.util.guava.Maybe; import brooklyn.util.task.TaskTags; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 e1eb51c..4bccd00 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 brooklyn.management.ManagementContext; +import org.apache.brooklyn.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/f7f03580/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 61fc0c3..ebb31f2 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 brooklyn.management.AccessController; +import org.apache.brooklyn.management.AccessController; public class NonDeploymentAccessManager implements AccessManager { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 43760b6..1e0caa7 100644 --- a/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java +++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.Policy; @@ -31,7 +32,6 @@ import brooklyn.entity.Application; import brooklyn.entity.Entity; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.proxying.EntityTypeRegistry; -import brooklyn.management.ManagementContext; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 31f9670..03d1a0b 100644 --- a/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java +++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java @@ -22,9 +22,10 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.location.Location; import brooklyn.location.LocationSpec; -import brooklyn.management.ManagementContext; public class NonDeploymentLocationManager implements LocationManagerInternal { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 e2478ea..f664ce4 100644 --- a/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java +++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java @@ -35,6 +35,19 @@ import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynObject; import org.apache.brooklyn.catalog.BrooklynCatalog; +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.mementos.BrooklynMementoPersister; import org.apache.brooklyn.mementos.BrooklynMementoRawData; @@ -57,20 +70,7 @@ import brooklyn.entity.rebind.RebindManager; import brooklyn.internal.storage.BrooklynStorage; import brooklyn.location.Location; import brooklyn.location.LocationRegistry; -import brooklyn.management.AccessController; -import brooklyn.management.EntityManager; -import brooklyn.management.ExecutionContext; -import brooklyn.management.ExecutionManager; -import brooklyn.management.LocationManager; -import brooklyn.management.SubscriptionContext; -import brooklyn.management.Task; -import brooklyn.management.entitlement.EntitlementManager; import brooklyn.management.entitlement.Entitlements; -import brooklyn.management.ha.HighAvailabilityManager; -import brooklyn.management.ha.HighAvailabilityMode; -import brooklyn.management.ha.ManagementNodeState; -import brooklyn.management.ha.ManagementPlaneSyncRecord; -import brooklyn.management.ha.ManagementPlaneSyncRecordPersister; import brooklyn.management.ha.OsgiManager; import brooklyn.util.guava.Maybe; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 2ed5125..64dd1dc 100644 --- a/core/src/main/java/brooklyn/management/internal/QueueingSubscriptionManager.java +++ b/core/src/main/java/brooklyn/management/internal/QueueingSubscriptionManager.java @@ -25,10 +25,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.management.SubscriptionHandle; + import brooklyn.entity.Entity; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; -import brooklyn.management.SubscriptionHandle; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 74d1430..07b0ae4 100644 --- a/core/src/main/java/brooklyn/management/internal/Subscription.java +++ b/core/src/main/java/brooklyn/management/internal/Subscription.java @@ -20,11 +20,12 @@ package brooklyn.management.internal; import java.util.Map; +import org.apache.brooklyn.management.SubscriptionHandle; + import brooklyn.entity.Entity; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.management.SubscriptionHandle; import brooklyn.util.text.Identifiers; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 7343966..7d5b343 100644 --- a/core/src/main/java/brooklyn/management/internal/SubscriptionTracker.java +++ b/core/src/main/java/brooklyn/management/internal/SubscriptionTracker.java @@ -20,12 +20,13 @@ package brooklyn.management.internal; import java.util.Collection; +import org.apache.brooklyn.management.SubscriptionContext; +import org.apache.brooklyn.management.SubscriptionHandle; + import brooklyn.entity.Entity; import brooklyn.entity.Group; import brooklyn.event.Sensor; import brooklyn.event.SensorEventListener; -import brooklyn.management.SubscriptionContext; -import brooklyn.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/f7f03580/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 ba30f53..364f3e1 100644 --- a/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java +++ b/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java @@ -28,6 +28,10 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; +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.policy.EntityAdjunct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,10 +52,6 @@ import brooklyn.entity.trait.Configurable; import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; import brooklyn.event.SensorEventListener; -import brooklyn.management.ExecutionContext; -import brooklyn.management.SubscriptionContext; -import brooklyn.management.SubscriptionHandle; -import brooklyn.management.Task; import brooklyn.management.internal.SubscriptionTracker; import brooklyn.util.config.ConfigBag; import brooklyn.util.flags.FlagUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 9f7b958..34d677b 100644 --- a/core/src/main/java/brooklyn/policy/basic/ConfigMapImpl.java +++ b/core/src/main/java/brooklyn/policy/basic/ConfigMapImpl.java @@ -23,6 +23,7 @@ import static brooklyn.util.GroovyJavaMethods.elvis; import java.util.Collections; import java.util.Map; +import org.apache.brooklyn.management.ExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +38,6 @@ import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.Sanitizer; import brooklyn.event.basic.StructuredConfigKey; -import brooklyn.management.ExecutionContext; import brooklyn.util.flags.TypeCoercions; import brooklyn.util.guava.Maybe; import brooklyn.util.internal.ConfigKeySelfExtracting; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 0195b9c..84b954a 100644 --- a/core/src/main/java/brooklyn/util/ResourceUtils.java +++ b/core/src/main/java/brooklyn/util/ResourceUtils.java @@ -38,6 +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.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.auth.Credentials; @@ -52,8 +54,6 @@ import brooklyn.catalog.internal.BasicBrooklynCatalog.BrooklynLoaderTracker; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.internal.BrooklynInitialization; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.ManagementContext; -import brooklyn.management.classloading.BrooklynClassLoadingContext; import brooklyn.management.classloading.JavaBrooklynClassLoadingContext; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 0f2e73d..1134fc5 100644 --- a/core/src/main/java/brooklyn/util/file/ArchiveTasks.java +++ b/core/src/main/java/brooklyn/util/file/ArchiveTasks.java @@ -20,9 +20,10 @@ package brooklyn.util.file; import java.util.Map; +import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.management.TaskFactory; + import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.TaskAdaptable; -import brooklyn.management.TaskFactory; import brooklyn.util.ResourceUtils; import brooklyn.util.net.Urls; import brooklyn.util.task.Tasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 b684aca..a6f16ef 100644 --- a/core/src/main/java/brooklyn/util/internal/ConfigKeySelfExtracting.java +++ b/core/src/main/java/brooklyn/util/internal/ConfigKeySelfExtracting.java @@ -20,8 +20,9 @@ package brooklyn.util.internal; import java.util.Map; +import org.apache.brooklyn.management.ExecutionContext; + import brooklyn.config.ConfigKey; -import brooklyn.management.ExecutionContext; /** Interface for resolving key values; typically implemented by the config key, * but discouraged for external usage. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 3d5050b..2333968 100644 --- a/core/src/main/java/brooklyn/util/mutex/SemaphoreForTasks.java +++ b/core/src/main/java/brooklyn/util/mutex/SemaphoreForTasks.java @@ -21,8 +21,9 @@ package brooklyn.util.mutex; import java.util.List; import java.util.Set; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; + import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableSet; import brooklyn.util.task.Tasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 3002922..750d5aa 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 brooklyn.management.ExecutionContext; -import brooklyn.management.ExecutionManager; -import brooklyn.management.Task; -import brooklyn.management.TaskAdaptable; +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 com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 2e75d35..72a878a 100644 --- a/core/src/main/java/brooklyn/util/task/BasicExecutionContext.java +++ b/core/src/main/java/brooklyn/util/task/BasicExecutionContext.java @@ -29,6 +29,12 @@ import java.util.concurrent.Callable; import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; +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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,12 +42,6 @@ import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.BrooklynTaskTags.WrappedEntity; import brooklyn.entity.basic.EntityInternal; -import brooklyn.management.ExecutionContext; -import brooklyn.management.ExecutionManager; -import brooklyn.management.HasTaskChildren; -import brooklyn.management.Task; -import brooklyn.management.TaskAdaptable; -import brooklyn.management.entitlement.EntitlementContext; import brooklyn.management.entitlement.Entitlements; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 00c6c9f..7b3c954 100644 --- a/core/src/main/java/brooklyn/util/task/BasicExecutionManager.java +++ b/core/src/main/java/brooklyn/util/task/BasicExecutionManager.java @@ -45,14 +45,14 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.internal.BrooklynFeatureEnablement; -import brooklyn.management.ExecutionManager; -import brooklyn.management.HasTaskChildren; -import brooklyn.management.Task; -import brooklyn.management.TaskAdaptable; import brooklyn.util.collections.MutableList; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.text.Identifiers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 e666680..6b1f82f 100644 --- a/core/src/main/java/brooklyn/util/task/BasicTask.java +++ b/core/src/main/java/brooklyn/util/task/BasicTask.java @@ -42,11 +42,11 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.management.HasTaskChildren; -import brooklyn.management.Task; import brooklyn.util.GroovyJavaMethods; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 b045e46..d57c508 100644 --- a/core/src/main/java/brooklyn/util/task/CompoundTask.java +++ b/core/src/main/java/brooklyn/util/task/CompoundTask.java @@ -28,13 +28,13 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.BrooklynTaskTags; -import brooklyn.management.HasTaskChildren; -import brooklyn.management.Task; -import brooklyn.management.TaskAdaptable; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 b4ae488..22ba5db 100644 --- a/core/src/main/java/brooklyn/util/task/DynamicSequentialTask.java +++ b/core/src/main/java/brooklyn/util/task/DynamicSequentialTask.java @@ -28,13 +28,13 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.BrooklynTaskTags; -import brooklyn.management.HasTaskChildren; -import brooklyn.management.Task; -import brooklyn.management.TaskQueueingContext; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 0ef29c4..68b4228 100644 --- a/core/src/main/java/brooklyn/util/task/DynamicTasks.java +++ b/core/src/main/java/brooklyn/util/task/DynamicTasks.java @@ -21,17 +21,17 @@ package brooklyn.util.task; import java.util.List; import java.util.concurrent.Callable; +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.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityInternal; -import brooklyn.management.ExecutionContext; -import brooklyn.management.Task; -import brooklyn.management.TaskAdaptable; -import brooklyn.management.TaskFactory; -import brooklyn.management.TaskQueueingContext; -import brooklyn.management.TaskWrapper; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.time.Duration; @@ -244,31 +244,31 @@ public class DynamicTasks { } } - /** @see #queue(brooklyn.management.TaskAdaptable) */ + /** @see #queue(org.apache.brooklyn.management.TaskAdaptable) */ public static void queue(TaskAdaptable<?> task1, TaskAdaptable<?> task2, TaskAdaptable<?> ...tasks) { queue(task1); queue(task2); for (TaskAdaptable<?> task: tasks) queue(task); } - /** @see #queue(brooklyn.management.TaskAdaptable) */ + /** @see #queue(org.apache.brooklyn.management.TaskAdaptable) */ public static <T extends TaskAdaptable<?>> T queue(TaskFactory<T> taskFactory) { return queue(taskFactory.newTask()); } - /** @see #queue(brooklyn.management.TaskAdaptable) */ + /** @see #queue(org.apache.brooklyn.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(brooklyn.management.TaskAdaptable) */ + /** @see #queue(org.apache.brooklyn.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(brooklyn.management.TaskAdaptable) */ + /** @see #queue(org.apache.brooklyn.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/f7f03580/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 1cb7f9f..7046ae4 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 brooklyn.management.Task; +import org.apache.brooklyn.management.Task; public interface ExecutionListener { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 91e4dfe..9c0e439 100644 --- a/core/src/main/java/brooklyn/util/task/ForwardingTask.java +++ b/core/src/main/java/brooklyn/util/task/ForwardingTask.java @@ -26,7 +26,8 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import brooklyn.management.Task; +import org.apache.brooklyn.management.Task; + import brooklyn.util.time.Duration; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 9828bbf..38c8944 100644 --- a/core/src/main/java/brooklyn/util/task/ParallelTask.java +++ b/core/src/main/java/brooklyn/util/task/ParallelTask.java @@ -23,7 +23,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; -import brooklyn.management.Task; +import org.apache.brooklyn.management.Task; + import brooklyn.util.exceptions.Exceptions; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 f684d52..cabbc93 100644 --- a/core/src/main/java/brooklyn/util/task/ScheduledTask.java +++ b/core/src/main/java/brooklyn/util/task/ScheduledTask.java @@ -28,7 +28,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import brooklyn.management.Task; +import org.apache.brooklyn.management.Task; + import brooklyn.util.collections.MutableMap; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 ebb6692..9e33106 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 brooklyn.management.Task; +import org.apache.brooklyn.management.Task; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 14c08c4..2518d51 100644 --- a/core/src/main/java/brooklyn/util/task/SingleThreadedScheduler.java +++ b/core/src/main/java/brooklyn/util/task/SingleThreadedScheduler.java @@ -29,11 +29,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.management.Task; - /** * Instances of this class ensures that {@link Task}s execute with in-order * single-threaded semantics. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 ed3e282..35585cf 100644 --- a/core/src/main/java/brooklyn/util/task/TaskBuilder.java +++ b/core/src/main/java/brooklyn/util/task/TaskBuilder.java @@ -24,10 +24,11 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.Callable; -import brooklyn.management.Task; -import brooklyn.management.TaskAdaptable; -import brooklyn.management.TaskFactory; -import brooklyn.management.TaskQueueingContext; +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 brooklyn.util.JavaGroovyEquivalents; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 b731b4d..3f3d697 100644 --- a/core/src/main/java/brooklyn/util/task/TaskInternal.java +++ b/core/src/main/java/brooklyn/util/task/TaskInternal.java @@ -23,8 +23,9 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import brooklyn.management.ExecutionManager; -import brooklyn.management.Task; +import org.apache.brooklyn.management.ExecutionManager; +import org.apache.brooklyn.management.Task; + import brooklyn.util.time.Duration; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 81b262f..43b7386 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 brooklyn.management.Task; +import org.apache.brooklyn.management.Task; /** * The scheduler is an internal mechanism to decorate {@link Task}s. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 624bae5..01ebd05 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 brooklyn.management.Task; -import brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.TaskAdaptable; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 f59e2d1..0011b48 100644 --- a/core/src/main/java/brooklyn/util/task/Tasks.java +++ b/core/src/main/java/brooklyn/util/task/Tasks.java @@ -27,15 +27,15 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.management.ExecutionContext; -import brooklyn.management.HasTaskChildren; -import brooklyn.management.Task; -import brooklyn.management.TaskAdaptable; -import brooklyn.management.TaskFactory; -import brooklyn.management.TaskQueueingContext; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.exceptions.ReferenceWithError; import brooklyn.util.repeat.Repeater; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 0670ad6..1283e1a 100644 --- a/core/src/main/java/brooklyn/util/task/ValueResolver.java +++ b/core/src/main/java/brooklyn/util/task/ValueResolver.java @@ -25,15 +25,15 @@ import java.util.concurrent.Callable; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.EntityInternal; -import brooklyn.management.ExecutionContext; -import brooklyn.management.Task; -import brooklyn.management.TaskAdaptable; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.flags.TypeCoercions; import brooklyn.util.guava.Maybe; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 8f4675a..374d066 100644 --- a/core/src/main/java/brooklyn/util/task/ssh/SshFetchTaskFactory.java +++ b/core/src/main/java/brooklyn/util/task/ssh/SshFetchTaskFactory.java @@ -18,11 +18,11 @@ */ package brooklyn.util.task.ssh; +import org.apache.brooklyn.management.TaskFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.TaskFactory; import brooklyn.util.config.ConfigBag; // cannot be (cleanly) instantiated due to nested generic self-referential type; however trivial subclasses do allow it http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 602151a..2e49fb1 100644 --- a/core/src/main/java/brooklyn/util/task/ssh/SshFetchTaskWrapper.java +++ b/core/src/main/java/brooklyn/util/task/ssh/SshFetchTaskWrapper.java @@ -22,12 +22,12 @@ 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.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.Task; -import brooklyn.management.TaskWrapper; import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 7bc6a4e..fdba1e0 100644 --- a/core/src/main/java/brooklyn/util/task/ssh/SshPutTaskFactory.java +++ b/core/src/main/java/brooklyn/util/task/ssh/SshPutTaskFactory.java @@ -21,11 +21,11 @@ package brooklyn.util.task.ssh; import java.io.InputStream; import java.io.Reader; +import org.apache.brooklyn.management.TaskFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.TaskFactory; import brooklyn.util.stream.KnownSizeInputStream; import brooklyn.util.stream.ReaderInputStream; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 8e4c62a..ac542ad 100644 --- a/core/src/main/java/brooklyn/util/task/ssh/SshPutTaskWrapper.java +++ b/core/src/main/java/brooklyn/util/task/ssh/SshPutTaskWrapper.java @@ -21,11 +21,11 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.management.Task; -import brooklyn.management.TaskWrapper; import brooklyn.util.config.ConfigBag; import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.task.TaskBuilder; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 8944bb8..641f43a 100644 --- a/core/src/main/java/brooklyn/util/task/ssh/SshTasks.java +++ b/core/src/main/java/brooklyn/util/task/ssh/SshTasks.java @@ -22,6 +22,11 @@ import java.util.Map; import javax.annotation.Nullable; +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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,11 +39,6 @@ import brooklyn.location.Location; import brooklyn.location.basic.AbstractLocation; import brooklyn.location.basic.LocationInternal; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; -import brooklyn.management.TaskAdaptable; -import brooklyn.management.TaskFactory; -import brooklyn.management.TaskQueueingContext; import brooklyn.util.ResourceUtils; import brooklyn.util.config.ConfigBag; import brooklyn.util.internal.ssh.SshTool; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 68e1b09..363467b 100644 --- a/core/src/main/java/brooklyn/util/task/system/ProcessTaskFactory.java +++ b/core/src/main/java/brooklyn/util/task/system/ProcessTaskFactory.java @@ -20,9 +20,10 @@ package brooklyn.util.task.system; import java.util.Map; +import org.apache.brooklyn.management.TaskFactory; + import brooklyn.config.ConfigKey; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.TaskFactory; import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.task.system.ProcessTaskStub.ScriptReturnType; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 4477884..3be6c30 100644 --- a/core/src/main/java/brooklyn/util/task/system/ProcessTaskWrapper.java +++ b/core/src/main/java/brooklyn/util/task/system/ProcessTaskWrapper.java @@ -21,12 +21,12 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.BrooklynTaskTags; -import brooklyn.management.Task; -import brooklyn.management.TaskWrapper; import brooklyn.util.config.ConfigBag; import brooklyn.util.internal.ssh.ShellTool; import brooklyn.util.stream.Streams; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 307b92a..5a9eea6 100644 --- a/core/src/main/java/brooklyn/util/text/TemplateProcessor.java +++ b/core/src/main/java/brooklyn/util/text/TemplateProcessor.java @@ -25,6 +25,7 @@ import java.io.OutputStreamWriter; import java.io.Writer; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +38,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.DependentConfiguration; import brooklyn.event.basic.Sensors; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 2c050cd..70f749b 100644 --- a/core/src/test/java/brooklyn/camp/lite/CampPlatformWithJustBrooklynMgmt.java +++ b/core/src/test/java/brooklyn/camp/lite/CampPlatformWithJustBrooklynMgmt.java @@ -18,11 +18,12 @@ */ package brooklyn.camp.lite; +import org.apache.brooklyn.management.ManagementContext; + import io.brooklyn.camp.BasicCampPlatform; import brooklyn.camp.brooklyn.api.HasBrooklynManagementContext; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; -import brooklyn.management.ManagementContext; public class CampPlatformWithJustBrooklynMgmt extends BasicCampPlatform implements HasBrooklynManagementContext { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 a56f1dd..252443a 100644 --- a/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java +++ b/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java @@ -21,7 +21,9 @@ 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 io.brooklyn.camp.spi.Assembly; import io.brooklyn.camp.spi.AssemblyTemplate; import io.brooklyn.camp.spi.pdp.PdpYamlTest; @@ -40,9 +42,9 @@ import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.catalog.CatalogItem.CatalogBundle; + import brooklyn.catalog.CatalogPredicates; import brooklyn.catalog.internal.BasicBrooklynCatalog; import brooklyn.catalog.internal.CatalogDto; @@ -54,7 +56,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.effector.AddChildrenEffector; import brooklyn.entity.effector.Effectors; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.management.Task; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.osgi.OsgiStandaloneTest; import brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 23d85f2..66b25ec 100644 --- a/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java +++ b/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java @@ -29,11 +29,12 @@ import io.brooklyn.camp.spi.instantiate.BasicAssemblyTemplateInstantiator; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; + import brooklyn.camp.brooklyn.api.AssemblyTemplateSpecInstantiator; import brooklyn.camp.brooklyn.api.HasBrooklynManagementContext; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.management.ManagementContext; -import brooklyn.management.classloading.BrooklynClassLoadingContext; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 075e7b5..23694dd 100644 --- a/core/src/test/java/brooklyn/catalog/internal/CatalogTestUtils.java +++ b/core/src/test/java/brooklyn/catalog/internal/CatalogTestUtils.java @@ -19,9 +19,10 @@ package brooklyn.catalog.internal; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; + import brooklyn.entity.proxying.EntitySpec; -import brooklyn.management.ManagementContext; -import brooklyn.management.classloading.BrooklynClassLoadingContext; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 4d84f22..9ae5ad3 100644 --- a/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java @@ -20,6 +20,7 @@ package brooklyn.enricher.basic; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.management.SubscriptionContext; import org.apache.brooklyn.policy.EnricherSpec; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -33,7 +34,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicSensorEvent; -import brooklyn.management.SubscriptionContext; import brooklyn.util.time.Duration; public class YamlRollingTimeWindowMeanEnricherTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 6637eba..f6c6ee8 100644 --- a/core/src/test/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricherTest.java @@ -20,6 +20,7 @@ package brooklyn.enricher.basic; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.management.SubscriptionContext; import org.apache.brooklyn.policy.EnricherSpec; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -32,7 +33,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicSensorEvent; -import brooklyn.management.SubscriptionContext; public class YamlTimeWeightedDeltaEnricherTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 9061a99..ece7c70 100644 --- a/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy +++ b/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy @@ -36,8 +36,8 @@ import brooklyn.entity.basic.MethodEffector import brooklyn.entity.proxying.EntitySpec import brooklyn.entity.proxying.ImplementedBy import brooklyn.entity.trait.Startable -import brooklyn.management.ManagementContext -import brooklyn.management.Task +import org.apache.brooklyn.management.ManagementContext +import org.apache.brooklyn.management.Task import brooklyn.management.internal.EffectorUtils import brooklyn.test.entity.TestApplication http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 420c3dd..a51af20 100644 --- a/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java +++ b/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java @@ -26,6 +26,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -38,8 +40,6 @@ import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.trait.Startable; -import brooklyn.management.ExecutionContext; -import brooklyn.management.Task; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.util.collections.MutableMap; import brooklyn.util.task.BasicTask; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 9bbad13..d409130 100644 --- a/core/src/test/java/brooklyn/entity/EntityPreManagementTest.java +++ b/core/src/test/java/brooklyn/entity/EntityPreManagementTest.java @@ -21,6 +21,8 @@ package brooklyn.entity; import java.util.ArrayList; import java.util.List; +import org.apache.brooklyn.management.EntityManager; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,8 +38,6 @@ import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.management.EntityManager; -import brooklyn.management.ManagementContext; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 2f8db0c..1af864f 100644 --- a/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java +++ b/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -41,7 +42,6 @@ import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.Locations.LocationsFilter; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 2274d2d..be75a95 100644 --- a/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java +++ b/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java @@ -32,6 +32,8 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.management.ExecutionManager; +import org.apache.brooklyn.management.Task; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -43,8 +45,6 @@ import brooklyn.config.ConfigPredicates; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.Entity; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.IntegerAttributeSensorAndConfigKey; -import brooklyn.management.ExecutionManager; -import brooklyn.management.Task; import brooklyn.util.collections.MutableMap; import brooklyn.util.task.BasicTask; import brooklyn.util.task.DeferredSupplier; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 ff009fe..8a6c5eb 100644 --- a/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java +++ b/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -33,7 +34,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.management.ManagementContext; import brooklyn.test.Asserts; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 bc1d712..12ac08b 100644 --- a/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java +++ b/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java @@ -29,6 +29,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +40,6 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.DependentConfiguration; -import brooklyn.management.Task; import brooklyn.test.Asserts; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 c941af6..bc2942a 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java @@ -20,13 +20,13 @@ package brooklyn.entity.basic; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.config.ConfigKey; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 42d705c..1200415 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.basic; import static org.testng.Assert.assertEquals; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.management.SubscriptionHandle; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -28,7 +29,6 @@ import org.testng.annotations.Test; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.BasicSensorEvent; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.management.SubscriptionHandle; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 ca329c1..690c0bc 100644 --- a/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java @@ -20,6 +20,7 @@ package brooklyn.entity.drivers; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -29,7 +30,6 @@ import brooklyn.entity.drivers.ReflectiveEntityDriverFactoryTest.MyDriver; import brooklyn.entity.drivers.ReflectiveEntityDriverFactoryTest.MyDriverDependentEntity; import brooklyn.entity.drivers.RegistryEntityDriverFactoryTest.MyOtherSshDriver; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 58f0bb5..1c5673b 100644 --- a/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java +++ b/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java @@ -21,6 +21,8 @@ package brooklyn.entity.effector; import java.util.List; import java.util.concurrent.Callable; +import org.apache.brooklyn.management.HasTaskChildren; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,8 +37,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.FailingEntity; import brooklyn.entity.trait.Startable; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.management.HasTaskChildren; -import brooklyn.management.Task; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 5073547..b2dbe71 100644 --- a/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java +++ b/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java @@ -27,6 +27,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.management.ExecutionManager; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -40,8 +42,6 @@ import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.MethodEffector; -import brooklyn.management.ExecutionManager; -import brooklyn.management.Task; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestApplicationImpl; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 bc7677c..551bd49 100644 --- a/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java +++ b/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java @@ -21,6 +21,8 @@ package brooklyn.entity.effector; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.management.HasTaskChildren; +import org.apache.brooklyn.management.Task; import org.testng.Assert; import org.testng.annotations.Test; @@ -34,8 +36,6 @@ import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; -import brooklyn.management.HasTaskChildren; -import brooklyn.management.Task; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 a7b0bec..38b8491 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java @@ -53,6 +53,7 @@ import brooklyn.entity.basic.EntityFactory; import brooklyn.entity.basic.Lifecycle; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.EntityTestUtils; import brooklyn.entity.basic.ServiceStateLogic; @@ -62,7 +63,6 @@ import brooklyn.entity.trait.FailingEntity; import brooklyn.event.SensorEvent; import brooklyn.location.Location; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.management.Task; import brooklyn.test.Asserts; import brooklyn.test.entity.TestEntity; import brooklyn.test.entity.TestEntityImpl; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 c2b8dec..22ecbdf 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java @@ -28,6 +28,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -44,7 +45,6 @@ import brooklyn.location.basic.LocationInternal; import brooklyn.location.basic.SimulatedLocation; import brooklyn.location.cloud.AbstractAvailabilityZoneExtension; import brooklyn.location.cloud.AvailabilityZoneExtension; -import brooklyn.management.ManagementContext; import brooklyn.test.Asserts; import brooklyn.test.entity.TestEntity; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 a52b84f..6c8c1ca 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java @@ -31,6 +31,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +50,6 @@ import brooklyn.entity.trait.Startable; import brooklyn.location.Location; import brooklyn.location.basic.PortRanges; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.management.Task; import brooklyn.test.Asserts; import brooklyn.test.entity.BlockingEntity; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 616303d..f8d9422 100644 --- a/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java +++ b/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java @@ -25,6 +25,7 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import org.apache.brooklyn.management.EntityManager; import org.apache.brooklyn.policy.PolicySpec; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -38,7 +39,6 @@ import brooklyn.entity.trait.Startable; import brooklyn.event.Sensor; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.management.EntityManager; import brooklyn.test.Asserts; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 823d299..7771426 100644 --- a/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java +++ b/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java @@ -33,6 +33,8 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.management.EntityManager; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -47,8 +49,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.management.EntityManager; -import brooklyn.management.Task; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 0258716..d6c272b 100644 --- a/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java @@ -31,6 +31,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -43,7 +44,6 @@ import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.StartableApplication; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 77c9356..0de3ebd 100644 --- a/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java @@ -22,12 +22,12 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.management.EntityManager; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.management.EntityManager; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 8f93b98..06c2ae8 100644 --- a/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java @@ -25,6 +25,8 @@ import static org.testng.Assert.assertTrue; import java.util.Collection; import java.util.Set; +import org.apache.brooklyn.management.EntityManager; +import org.apache.brooklyn.management.Task; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -36,8 +38,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; -import brooklyn.management.EntityManager; -import brooklyn.management.Task; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 659e026..8b74054 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java @@ -41,10 +41,12 @@ import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.Sensors; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.ManagementNodeState; import brooklyn.management.internal.LocalManagementContext; + +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.brooklyn.test.TestResourceUnavailableException; + import brooklyn.util.javalang.UrlClassLoader; import com.google.common.base.Function;
