http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java b/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java index a2e3673..ca4034d 100644 --- a/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java @@ -22,6 +22,7 @@ import java.util.Set; import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.brooklyn.mementos.BrooklynMementoPersister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +31,6 @@ import brooklyn.config.BrooklynLogging; import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.rebind.persister.PersistenceActivityMetrics; -import brooklyn.management.ha.ManagementNodeState; import brooklyn.management.internal.BrooklynObjectManagementMode; import brooklyn.management.internal.EntityManagerInternal; import brooklyn.management.internal.LocationManagerInternal;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java b/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java index a871168..484e6f4 100644 --- a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java +++ b/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java @@ -34,6 +34,8 @@ import brooklyn.basic.BrooklynObject; import brooklyn.basic.BrooklynObjectInternal; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.mementos.BrooklynMementoPersister; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; @@ -46,8 +48,6 @@ import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils; import brooklyn.entity.rebind.persister.PersistenceActivityMetrics; import brooklyn.internal.BrooklynFeatureEnablement; import brooklyn.location.Location; -import brooklyn.management.ExecutionContext; -import brooklyn.management.Task; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java b/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java index 632825e..1d7f0e2 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java @@ -26,6 +26,7 @@ import java.util.Map; import brooklyn.basic.BrooklynObject; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; @@ -33,7 +34,6 @@ import org.apache.brooklyn.policy.Policy; import brooklyn.entity.Entity; import brooklyn.entity.Feed; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; import brooklyn.util.collections.MutableMap; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java b/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java index f946495..e46ff66 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java @@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynObject; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; @@ -34,7 +35,6 @@ import brooklyn.catalog.internal.CatalogUtils; import brooklyn.entity.Entity; import brooklyn.entity.Feed; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; /** Looks in {@link RebindContext} <i>and</i> {@link ManagementContext} to find entities, locations, etc. */ public class RebindContextLookupContext implements LookupContext { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java index 4e32f73..87d611f 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java @@ -39,6 +39,8 @@ import brooklyn.basic.BrooklynObjectInternal; import org.apache.brooklyn.catalog.BrooklynCatalog; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; +import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.brooklyn.mementos.BrooklynMemento; import org.apache.brooklyn.mementos.BrooklynMementoManifest; import org.apache.brooklyn.mementos.BrooklynMementoPersister; @@ -77,8 +79,6 @@ import brooklyn.internal.BrooklynFeatureEnablement; import brooklyn.location.Location; import brooklyn.location.basic.AbstractLocation; import brooklyn.location.basic.LocationInternal; -import brooklyn.management.classloading.BrooklynClassLoadingContext; -import brooklyn.management.ha.ManagementNodeState; import brooklyn.management.internal.BrooklynObjectManagementMode; import brooklyn.management.internal.BrooklynObjectManagerInternal; import brooklyn.management.internal.EntityManagerInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java index 78392e2..7aa542f 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java @@ -29,6 +29,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.management.ha.MementoCopyMode; import org.apache.brooklyn.mementos.BrooklynMementoPersister; import org.apache.brooklyn.mementos.BrooklynMementoRawData; import org.apache.brooklyn.mementos.TreeNode; @@ -49,11 +53,7 @@ import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils.CreateBackupMod import brooklyn.entity.rebind.persister.PersistenceActivityMetrics; import brooklyn.entity.rebind.transformer.CompoundTransformer; import brooklyn.internal.BrooklynFeatureEnablement; -import brooklyn.management.ExecutionContext; -import brooklyn.management.Task; import brooklyn.management.ha.HighAvailabilityManagerImpl; -import brooklyn.management.ha.ManagementNodeState; -import brooklyn.management.ha.MementoCopyMode; import brooklyn.management.internal.ManagementContextInternal; 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/entity/rebind/dto/MementosGenerators.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java index 288773f..9e697fb 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java @@ -29,6 +29,8 @@ import brooklyn.basic.BrooklynObject; import brooklyn.basic.BrooklynTypes; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.mementos.BrooklynMemento; import org.apache.brooklyn.mementos.CatalogItemMemento; import org.apache.brooklyn.mementos.EnricherMemento; @@ -58,8 +60,6 @@ import brooklyn.event.AttributeSensor.SensorPersistenceMode; import brooklyn.event.feed.AbstractFeed; import brooklyn.location.Location; import brooklyn.location.basic.LocationInternal; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java index 781c521..73b82fe 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java @@ -27,6 +27,11 @@ import brooklyn.basic.BrooklynObject; import brooklyn.basic.BrooklynObjectInternal; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ManagementContext; +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.MementoCopyMode; import org.apache.brooklyn.mementos.BrooklynMementoRawData; import org.apache.brooklyn.mementos.Memento; import org.apache.brooklyn.policy.Enricher; @@ -46,12 +51,7 @@ import brooklyn.entity.rebind.transformer.CompoundTransformerLoader; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.HighAvailabilityMode; -import brooklyn.management.ha.ManagementNodeState; -import brooklyn.management.ha.ManagementPlaneSyncRecord; import brooklyn.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore; -import brooklyn.management.ha.MementoCopyMode; import brooklyn.management.internal.LocalLocationManager; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.util.ResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java b/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java index c3ce92a..8e9820f 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java @@ -34,12 +34,12 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.annotation.Nullable; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynServerConfig; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.util.collections.MutableList; 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/entity/rebind/persister/MementoSerializer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/MementoSerializer.java b/core/src/main/java/brooklyn/entity/rebind/persister/MementoSerializer.java index 39b1a83..63284de 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/MementoSerializer.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/MementoSerializer.java @@ -18,11 +18,10 @@ */ package brooklyn.entity.rebind.persister; +import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; import org.apache.brooklyn.mementos.BrooklynMemento; import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; -import brooklyn.management.ha.ManagementNodeSyncRecord; - /** Serializes the given object; it is often used with {@link BrooklynMemento} for persisting and restoring, * though it can be used for any object (and is also used for the {@link ManagementNodeSyncRecord} instances) */ public interface MementoSerializer<T> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/entity/rebind/persister/PersistenceObjectStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/PersistenceObjectStore.java b/core/src/main/java/brooklyn/entity/rebind/persister/PersistenceObjectStore.java index ffefcd3..50a4eaa 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/PersistenceObjectStore.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/PersistenceObjectStore.java @@ -23,8 +23,9 @@ import java.util.List; import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.ReadWriteLock; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; + 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/entity/rebind/persister/XmlMementoSerializer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java b/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java index fe8b87c..87db916 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java @@ -33,6 +33,9 @@ import org.slf4j.LoggerFactory; import brooklyn.basic.AbstractBrooklynObjectSpec; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; @@ -57,9 +60,6 @@ import brooklyn.entity.trait.Identifiable; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; -import brooklyn.management.classloading.BrooklynClassLoadingContext; import brooklyn.management.classloading.BrooklynClassLoadingContextSequential; import brooklyn.management.classloading.ClassLoaderFromBrooklynClassLoadingContext; import brooklyn.management.classloading.JavaBrooklynClassLoadingContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/entity/rebind/plane/dto/BasicManagementNodeSyncRecord.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/plane/dto/BasicManagementNodeSyncRecord.java b/core/src/main/java/brooklyn/entity/rebind/plane/dto/BasicManagementNodeSyncRecord.java index bc1e137..fe2dc7b 100644 --- a/core/src/main/java/brooklyn/entity/rebind/plane/dto/BasicManagementNodeSyncRecord.java +++ b/core/src/main/java/brooklyn/entity/rebind/plane/dto/BasicManagementNodeSyncRecord.java @@ -21,12 +21,12 @@ package brooklyn.entity.rebind.plane.dto; import java.io.Serializable; import java.net.URI; +import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import brooklyn.BrooklynVersion; -import brooklyn.management.ha.ManagementNodeState; -import brooklyn.management.ha.ManagementNodeSyncRecord; import brooklyn.util.time.Time; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/entity/rebind/plane/dto/ManagementPlaneSyncRecordImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/plane/dto/ManagementPlaneSyncRecordImpl.java b/core/src/main/java/brooklyn/entity/rebind/plane/dto/ManagementPlaneSyncRecordImpl.java index acbd39e..977e83d 100644 --- a/core/src/main/java/brooklyn/entity/rebind/plane/dto/ManagementPlaneSyncRecordImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/plane/dto/ManagementPlaneSyncRecordImpl.java @@ -24,8 +24,9 @@ import static com.google.common.base.Preconditions.checkState; import java.io.Serializable; import java.util.Map; -import brooklyn.management.ha.ManagementNodeSyncRecord; -import brooklyn.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; + import brooklyn.util.collections.MutableMap; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/entity/trait/StartableMethods.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/trait/StartableMethods.java b/core/src/main/java/brooklyn/entity/trait/StartableMethods.java index 8c1b90d..b43c514 100644 --- a/core/src/main/java/brooklyn/entity/trait/StartableMethods.java +++ b/core/src/main/java/brooklyn/entity/trait/StartableMethods.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import org.apache.brooklyn.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +32,6 @@ import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.effector.Effectors; import brooklyn.location.Location; -import brooklyn.management.TaskAdaptable; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.CompoundRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/event/basic/AbstractCollectionConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/AbstractCollectionConfigKey.java b/core/src/main/java/brooklyn/event/basic/AbstractCollectionConfigKey.java index 8274f9e..502a895 100644 --- a/core/src/main/java/brooklyn/event/basic/AbstractCollectionConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/AbstractCollectionConfigKey.java @@ -22,12 +22,12 @@ import java.util.Collection; import java.util.Map; import java.util.concurrent.ExecutionException; +import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.management.ExecutionContext; -import brooklyn.management.TaskAdaptable; import brooklyn.util.collections.MutableSet; import brooklyn.util.text.Identifiers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/event/basic/AbstractStructuredConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/AbstractStructuredConfigKey.java b/core/src/main/java/brooklyn/event/basic/AbstractStructuredConfigKey.java index 620c262..ac90a14 100644 --- a/core/src/main/java/brooklyn/event/basic/AbstractStructuredConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/AbstractStructuredConfigKey.java @@ -21,8 +21,9 @@ package brooklyn.event.basic; import java.util.Map; import java.util.concurrent.ExecutionException; +import org.apache.brooklyn.management.ExecutionContext; + import brooklyn.config.ConfigKey; -import brooklyn.management.ExecutionContext; import brooklyn.util.exceptions.Exceptions; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/event/basic/AttributeSensorAndConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/AttributeSensorAndConfigKey.java b/core/src/main/java/brooklyn/event/basic/AttributeSensorAndConfigKey.java index 3bed7b5..57e0d40 100644 --- a/core/src/main/java/brooklyn/event/basic/AttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/AttributeSensorAndConfigKey.java @@ -18,6 +18,7 @@ */ package brooklyn.event.basic; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +32,6 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityLocal; import brooklyn.event.Sensor; import brooklyn.event.feed.ConfigToAttributes; -import brooklyn.management.ManagementContext; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.flags.TypeCoercions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/event/basic/BasicAttributeSensorAndConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/BasicAttributeSensorAndConfigKey.java b/core/src/main/java/brooklyn/event/basic/BasicAttributeSensorAndConfigKey.java index 80e7e15..4ab2aae 100644 --- a/core/src/main/java/brooklyn/event/basic/BasicAttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/BasicAttributeSensorAndConfigKey.java @@ -18,12 +18,13 @@ */ package brooklyn.event.basic; +import org.apache.brooklyn.management.ManagementContext; + import com.google.common.reflect.TypeToken; import brooklyn.config.ConfigKey; import brooklyn.entity.Entity; import brooklyn.event.Sensor; -import brooklyn.management.ManagementContext; /** * A {@link Sensor} describing an attribute that can be configured with a default value. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java b/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java index 753905d..9c87274 100644 --- a/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java @@ -27,12 +27,12 @@ import java.util.concurrent.ExecutionException; import javax.annotation.Nullable; +import org.apache.brooklyn.management.ExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigInheritance; import brooklyn.config.ConfigKey; -import brooklyn.management.ExecutionContext; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.TypeTokens; import brooklyn.util.internal.ConfigKeySelfExtracting; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/event/basic/DependentConfiguration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/DependentConfiguration.java b/core/src/main/java/brooklyn/event/basic/DependentConfiguration.java index 14a159d..0498f23 100644 --- a/core/src/main/java/brooklyn/event/basic/DependentConfiguration.java +++ b/core/src/main/java/brooklyn/event/basic/DependentConfiguration.java @@ -34,6 +34,11 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; +import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.management.SubscriptionHandle; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.management.TaskFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,11 +53,6 @@ import brooklyn.entity.basic.Lifecycle; import brooklyn.event.AttributeSensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.management.ExecutionContext; -import brooklyn.management.SubscriptionHandle; -import brooklyn.management.Task; -import brooklyn.management.TaskAdaptable; -import brooklyn.management.TaskFactory; import brooklyn.util.GroovyJavaMethods; import brooklyn.util.collections.CollectionFunctionals; import brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/event/basic/MapConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/MapConfigKey.java b/core/src/main/java/brooklyn/event/basic/MapConfigKey.java index 811aabb..41d15df 100644 --- a/core/src/main/java/brooklyn/event/basic/MapConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/MapConfigKey.java @@ -25,11 +25,11 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutionException; +import org.apache.brooklyn.management.ExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.management.ExecutionContext; import brooklyn.util.collections.Jsonya; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java b/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java index 0a501cd..538b82c 100644 --- a/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java @@ -21,6 +21,7 @@ package brooklyn.event.basic; import java.util.Collection; import java.util.Iterator; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +35,6 @@ import brooklyn.location.MachineProvisioningLocation; import brooklyn.location.PortRange; import brooklyn.location.PortSupplier; import brooklyn.location.basic.Locations; -import brooklyn.management.ManagementContext; 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/event/basic/SubElementConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/SubElementConfigKey.java b/core/src/main/java/brooklyn/event/basic/SubElementConfigKey.java index b65c532..e98dc16 100644 --- a/core/src/main/java/brooklyn/event/basic/SubElementConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/SubElementConfigKey.java @@ -20,8 +20,9 @@ package brooklyn.event.basic; import java.util.Map; +import org.apache.brooklyn.management.ExecutionContext; + import brooklyn.config.ConfigKey; -import brooklyn.management.ExecutionContext; import brooklyn.util.exceptions.Exceptions; @SuppressWarnings("rawtypes") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java b/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java index 7f88781..6e5c561 100644 --- a/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java @@ -18,13 +18,13 @@ */ package brooklyn.event.basic; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityInternal; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.util.text.TemplateProcessor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/event/feed/ConfigToAttributes.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/ConfigToAttributes.java b/core/src/main/java/brooklyn/event/feed/ConfigToAttributes.java index c35e59b..4b4db43 100644 --- a/core/src/main/java/brooklyn/event/feed/ConfigToAttributes.java +++ b/core/src/main/java/brooklyn/event/feed/ConfigToAttributes.java @@ -18,11 +18,12 @@ */ package brooklyn.event.feed; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.entity.basic.EntityLocal; import brooklyn.event.Sensor; import brooklyn.event.basic.AttributeSensorAndConfigKey; import brooklyn.event.basic.TemplatedStringAttributeSensorAndConfigKey; -import brooklyn.management.ManagementContext; /** Simple config adapter for setting {@link AttributeSensorAndConfigKey} sensor values from the config value or config default */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/event/feed/Poller.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/Poller.java b/core/src/main/java/brooklyn/event/feed/Poller.java index 1bb87c9..5d966b7 100644 --- a/core/src/main/java/brooklyn/event/feed/Poller.java +++ b/core/src/main/java/brooklyn/event/feed/Poller.java @@ -22,6 +22,7 @@ import java.util.LinkedHashSet; import java.util.Set; import java.util.concurrent.Callable; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +31,6 @@ import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.EntityLocal; -import brooklyn.management.Task; import brooklyn.util.collections.MutableMap; import brooklyn.util.task.DynamicSequentialTask; import brooklyn.util.task.ScheduledTask; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/event/feed/shell/ShellFeed.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/shell/ShellFeed.java b/core/src/main/java/brooklyn/event/feed/shell/ShellFeed.java index f325a2d..495338d 100644 --- a/core/src/main/java/brooklyn/event/feed/shell/ShellFeed.java +++ b/core/src/main/java/brooklyn/event/feed/shell/ShellFeed.java @@ -27,6 +27,7 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.management.ExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +42,6 @@ import brooklyn.event.feed.Poller; import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.ssh.SshFeed; import brooklyn.event.feed.ssh.SshPollValue; -import brooklyn.management.ExecutionContext; import brooklyn.util.task.system.ProcessTaskFactory; import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.task.system.internal.SystemProcessTaskFactory.ConcreteSystemProcessTaskFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeed.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeed.java b/core/src/main/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeed.java index 99eec78..4026fad 100644 --- a/core/src/main/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeed.java +++ b/core/src/main/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeed.java @@ -34,6 +34,7 @@ import java.util.regex.Pattern; import javax.annotation.Nullable; +import org.apache.brooklyn.management.ExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +50,6 @@ import brooklyn.event.feed.AbstractFeed; import brooklyn.event.feed.PollHandler; import brooklyn.event.feed.Poller; import brooklyn.location.basic.WinRmMachineLocation; -import brooklyn.management.ExecutionContext; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.flags.TypeCoercions; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/internal/BrooklynFeatureEnablement.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/internal/BrooklynFeatureEnablement.java b/core/src/main/java/brooklyn/internal/BrooklynFeatureEnablement.java index 053400a..c444630 100644 --- a/core/src/main/java/brooklyn/internal/BrooklynFeatureEnablement.java +++ b/core/src/main/java/brooklyn/internal/BrooklynFeatureEnablement.java @@ -20,12 +20,12 @@ package brooklyn.internal; import java.util.Map; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynProperties; import brooklyn.internal.storage.BrooklynStorage; -import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.util.internal.ssh.ShellTool; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/location/basic/AbstractLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/AbstractLocation.java b/core/src/main/java/brooklyn/location/basic/AbstractLocation.java index 20c7338..e738880 100644 --- a/core/src/main/java/brooklyn/location/basic/AbstractLocation.java +++ b/core/src/main/java/brooklyn/location/basic/AbstractLocation.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.mementos.LocationMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,7 +51,6 @@ import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.geo.HasHostGeoInfo; import brooklyn.location.geo.HostGeoInfo; -import brooklyn.management.Task; import brooklyn.management.internal.LocalLocationManager; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.util.collections.SetFromLiveMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/location/basic/AbstractLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/AbstractLocationResolver.java b/core/src/main/java/brooklyn/location/basic/AbstractLocationResolver.java index 2fe1769..dc4b65d 100644 --- a/core/src/main/java/brooklyn/location/basic/AbstractLocationResolver.java +++ b/core/src/main/java/brooklyn/location/basic/AbstractLocationResolver.java @@ -26,6 +26,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +35,6 @@ import brooklyn.location.LocationRegistry; import brooklyn.location.LocationResolver; import brooklyn.location.LocationSpec; import brooklyn.location.basic.AbstractLocationResolver.SpecParser.ParsedSpec; -import brooklyn.management.ManagementContext; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.text.KeyValueParser; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/location/basic/BasicLocationRegistry.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/BasicLocationRegistry.java b/core/src/main/java/brooklyn/location/basic/BasicLocationRegistry.java index 0e6c348..be93fbb 100644 --- a/core/src/main/java/brooklyn/location/basic/BasicLocationRegistry.java +++ b/core/src/main/java/brooklyn/location/basic/BasicLocationRegistry.java @@ -32,9 +32,10 @@ import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.catalog.BrooklynCatalog; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.catalog.CatalogPredicates; import brooklyn.config.ConfigMap; import brooklyn.config.ConfigPredicates; @@ -45,7 +46,6 @@ import brooklyn.location.LocationRegistry; import brooklyn.location.LocationResolver; import brooklyn.location.LocationResolver.EnableableLocationResolver; import brooklyn.location.LocationSpec; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalLocationManager; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/location/basic/BasicMachineDetails.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/BasicMachineDetails.java b/core/src/main/java/brooklyn/location/basic/BasicMachineDetails.java index 84ab3df..873a0b2 100644 --- a/core/src/main/java/brooklyn/location/basic/BasicMachineDetails.java +++ b/core/src/main/java/brooklyn/location/basic/BasicMachineDetails.java @@ -28,13 +28,13 @@ import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.concurrent.Immutable; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.location.HardwareDetails; import brooklyn.location.MachineDetails; import brooklyn.location.OsDetails; -import brooklyn.management.Task; import brooklyn.util.ResourceUtils; import brooklyn.util.stream.Streams; import brooklyn.util.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/location/basic/CatalogLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/CatalogLocationResolver.java b/core/src/main/java/brooklyn/location/basic/CatalogLocationResolver.java index 0c22e8b..85d6023 100644 --- a/core/src/main/java/brooklyn/location/basic/CatalogLocationResolver.java +++ b/core/src/main/java/brooklyn/location/basic/CatalogLocationResolver.java @@ -24,14 +24,14 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.catalog.internal.CatalogUtils; import brooklyn.location.Location; import brooklyn.location.LocationRegistry; import brooklyn.location.LocationResolver; import brooklyn.location.LocationSpec; -import brooklyn.management.ManagementContext; /** * Given a location spec in the form {@code brooklyn.catalog:<symbolicName>:<version>}, http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/location/basic/DefinedLocationByIdResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/DefinedLocationByIdResolver.java b/core/src/main/java/brooklyn/location/basic/DefinedLocationByIdResolver.java index 40716b5..ab51b6b 100644 --- a/core/src/main/java/brooklyn/location/basic/DefinedLocationByIdResolver.java +++ b/core/src/main/java/brooklyn/location/basic/DefinedLocationByIdResolver.java @@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +30,6 @@ import brooklyn.location.Location; import brooklyn.location.LocationDefinition; import brooklyn.location.LocationRegistry; import brooklyn.location.LocationResolver; -import brooklyn.management.ManagementContext; /** * looks up based on ID in DefinedLocations map http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/location/basic/FixedListMachineProvisioningLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/FixedListMachineProvisioningLocation.java b/core/src/main/java/brooklyn/location/basic/FixedListMachineProvisioningLocation.java index 1e2184d..f6f7e67 100644 --- a/core/src/main/java/brooklyn/location/basic/FixedListMachineProvisioningLocation.java +++ b/core/src/main/java/brooklyn/location/basic/FixedListMachineProvisioningLocation.java @@ -28,6 +28,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.management.LocationManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,7 +51,6 @@ import brooklyn.location.MachineLocationCustomizer; import brooklyn.location.MachineProvisioningLocation; import brooklyn.location.NoMachinesAvailableException; import brooklyn.location.cloud.CloudLocationConfig; -import brooklyn.management.LocationManager; import brooklyn.util.collections.CollectionFunctionals; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/location/basic/LocationConfigUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/LocationConfigUtils.java b/core/src/main/java/brooklyn/location/basic/LocationConfigUtils.java index eb9e96d..9f7bfa2 100644 --- a/core/src/main/java/brooklyn/location/basic/LocationConfigUtils.java +++ b/core/src/main/java/brooklyn/location/basic/LocationConfigUtils.java @@ -30,6 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +38,6 @@ import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.internal.BrooklynFeatureEnablement; import brooklyn.location.cloud.CloudLocationConfig; -import brooklyn.management.ManagementContext; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/location/basic/LocationInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/LocationInternal.java b/core/src/main/java/brooklyn/location/basic/LocationInternal.java index d8ad555..e99893d 100644 --- a/core/src/main/java/brooklyn/location/basic/LocationInternal.java +++ b/core/src/main/java/brooklyn/location/basic/LocationInternal.java @@ -20,6 +20,7 @@ package brooklyn.location.basic; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.mementos.LocationMemento; import brooklyn.basic.BrooklynObjectInternal; @@ -28,7 +29,6 @@ import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.rebind.RebindSupport; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; import brooklyn.util.config.ConfigBag; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/location/basic/Locations.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/Locations.java b/core/src/main/java/brooklyn/location/basic/Locations.java index 5fadd26..06de156 100644 --- a/core/src/main/java/brooklyn/location/basic/Locations.java +++ b/core/src/main/java/brooklyn/location/basic/Locations.java @@ -24,6 +24,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import org.apache.brooklyn.management.LocationManager; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,8 +34,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.MachineLocation; -import brooklyn.management.LocationManager; -import brooklyn.management.ManagementContext; import brooklyn.util.collections.MutableList; import brooklyn.util.guava.Maybe; import brooklyn.util.yaml.Yamls; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/location/basic/MultiLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/MultiLocation.java b/core/src/main/java/brooklyn/location/basic/MultiLocation.java index fed111f..bfe90f7 100644 --- a/core/src/main/java/brooklyn/location/basic/MultiLocation.java +++ b/core/src/main/java/brooklyn/location/basic/MultiLocation.java @@ -26,6 +26,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.location.Location; @@ -35,7 +37,6 @@ import brooklyn.location.MachineProvisioningLocation; import brooklyn.location.NoMachinesAvailableException; import brooklyn.location.cloud.AbstractAvailabilityZoneExtension; import brooklyn.location.cloud.AvailabilityZoneExtension; -import brooklyn.management.ManagementContext; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.CompoundRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/location/basic/MultiLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/MultiLocationResolver.java b/core/src/main/java/brooklyn/location/basic/MultiLocationResolver.java index 5e1a703..96c2981 100644 --- a/core/src/main/java/brooklyn/location/basic/MultiLocationResolver.java +++ b/core/src/main/java/brooklyn/location/basic/MultiLocationResolver.java @@ -26,6 +26,7 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +34,6 @@ import brooklyn.location.Location; import brooklyn.location.LocationRegistry; import brooklyn.location.LocationResolver; import brooklyn.location.LocationSpec; -import brooklyn.management.ManagementContext; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.text.KeyValueParser; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/location/basic/NamedLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/NamedLocationResolver.java b/core/src/main/java/brooklyn/location/basic/NamedLocationResolver.java index 93d7a95..3cdb310 100644 --- a/core/src/main/java/brooklyn/location/basic/NamedLocationResolver.java +++ b/core/src/main/java/brooklyn/location/basic/NamedLocationResolver.java @@ -23,6 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.NoSuchElementException; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +31,6 @@ import brooklyn.location.Location; import brooklyn.location.LocationDefinition; import brooklyn.location.LocationRegistry; import brooklyn.location.LocationResolver; -import brooklyn.management.ManagementContext; import brooklyn.util.config.ConfigBag; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java b/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java index 8c06274..5e8b8c4 100644 --- a/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java +++ b/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java @@ -45,6 +45,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -84,7 +85,6 @@ import brooklyn.location.OsDetails; import brooklyn.location.PortRange; import brooklyn.location.PortSupplier; import brooklyn.location.access.PortForwardManager; -import brooklyn.management.Task; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/location/cloud/AbstractAvailabilityZoneExtension.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/cloud/AbstractAvailabilityZoneExtension.java b/core/src/main/java/brooklyn/location/cloud/AbstractAvailabilityZoneExtension.java index dedcef5..197f39b 100644 --- a/core/src/main/java/brooklyn/location/cloud/AbstractAvailabilityZoneExtension.java +++ b/core/src/main/java/brooklyn/location/cloud/AbstractAvailabilityZoneExtension.java @@ -24,8 +24,9 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.location.Location; -import brooklyn.management.ManagementContext; import com.google.common.annotations.Beta; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/ManagementContextInjectable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/ManagementContextInjectable.java b/core/src/main/java/brooklyn/management/ManagementContextInjectable.java index 79cb83e..a8d0a83 100644 --- a/core/src/main/java/brooklyn/management/ManagementContextInjectable.java +++ b/core/src/main/java/brooklyn/management/ManagementContextInjectable.java @@ -18,7 +18,7 @@ */ package brooklyn.management; -import brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ManagementContext; /** * Provides a way for the {@link ManagementContext} to be injected directly. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/classloading/AbstractBrooklynClassLoadingContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/classloading/AbstractBrooklynClassLoadingContext.java b/core/src/main/java/brooklyn/management/classloading/AbstractBrooklynClassLoadingContext.java index 7a3cd2c..b1696c4 100644 --- a/core/src/main/java/brooklyn/management/classloading/AbstractBrooklynClassLoadingContext.java +++ b/core/src/main/java/brooklyn/management/classloading/AbstractBrooklynClassLoadingContext.java @@ -2,7 +2,9 @@ package brooklyn.management.classloading; import javax.annotation.Nullable; -import brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; + import brooklyn.util.guava.Maybe; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContextSequential.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContextSequential.java b/core/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContextSequential.java index e1b43b6..bd8bc59 100644 --- a/core/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContextSequential.java +++ b/core/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContextSequential.java @@ -22,10 +22,11 @@ import java.net.URL; import java.util.List; import java.util.Set; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.management.ManagementContext; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/classloading/ClassLoaderFromBrooklynClassLoadingContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/classloading/ClassLoaderFromBrooklynClassLoadingContext.java b/core/src/main/java/brooklyn/management/classloading/ClassLoaderFromBrooklynClassLoadingContext.java index 0ac035a..c4d4cde 100644 --- a/core/src/main/java/brooklyn/management/classloading/ClassLoaderFromBrooklynClassLoadingContext.java +++ b/core/src/main/java/brooklyn/management/classloading/ClassLoaderFromBrooklynClassLoadingContext.java @@ -20,6 +20,8 @@ package brooklyn.management.classloading; import java.net.URL; +import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; + public class ClassLoaderFromBrooklynClassLoadingContext extends ClassLoader { /** Constructs a {@link ClassLoader} which delegates to the given {@link BrooklynClassLoadingContext} */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/classloading/JavaBrooklynClassLoadingContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/classloading/JavaBrooklynClassLoadingContext.java b/core/src/main/java/brooklyn/management/classloading/JavaBrooklynClassLoadingContext.java index 7365596..79b173f 100644 --- a/core/src/main/java/brooklyn/management/classloading/JavaBrooklynClassLoadingContext.java +++ b/core/src/main/java/brooklyn/management/classloading/JavaBrooklynClassLoadingContext.java @@ -26,7 +26,8 @@ import java.net.URL; import java.util.Collections; import java.util.Enumeration; -import brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ManagementContext; + 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/management/classloading/OsgiBrooklynClassLoadingContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/classloading/OsgiBrooklynClassLoadingContext.java b/core/src/main/java/brooklyn/management/classloading/OsgiBrooklynClassLoadingContext.java index fa04b3c..28d522a 100644 --- a/core/src/main/java/brooklyn/management/classloading/OsgiBrooklynClassLoadingContext.java +++ b/core/src/main/java/brooklyn/management/classloading/OsgiBrooklynClassLoadingContext.java @@ -24,9 +24,10 @@ import java.util.Collections; import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.catalog.CatalogItem.CatalogBundle; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.entitlement.EntitlementClass; + import brooklyn.catalog.internal.CatalogUtils; -import brooklyn.management.ManagementContext; -import brooklyn.management.entitlement.EntitlementClass; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.ha.OsgiManager; import brooklyn.management.internal.ManagementContextInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/entitlement/BasicEntitlementClassDefinition.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/entitlement/BasicEntitlementClassDefinition.java b/core/src/main/java/brooklyn/management/entitlement/BasicEntitlementClassDefinition.java index 8f95ee0..4ce16e2 100644 --- a/core/src/main/java/brooklyn/management/entitlement/BasicEntitlementClassDefinition.java +++ b/core/src/main/java/brooklyn/management/entitlement/BasicEntitlementClassDefinition.java @@ -18,6 +18,8 @@ */ package brooklyn.management.entitlement; +import org.apache.brooklyn.management.entitlement.EntitlementClass; + import com.google.common.base.Objects; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java b/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java index cd6dae3..c41f513 100644 --- a/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java +++ b/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java @@ -18,6 +18,9 @@ */ package brooklyn.management.entitlement; +import org.apache.brooklyn.management.entitlement.EntitlementClass; +import org.apache.brooklyn.management.entitlement.EntitlementContext; +import org.apache.brooklyn.management.entitlement.EntitlementManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/entitlement/EntitlementPredicates.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/entitlement/EntitlementPredicates.java b/core/src/main/java/brooklyn/management/entitlement/EntitlementPredicates.java index d021da3..5b006f8 100644 --- a/core/src/main/java/brooklyn/management/entitlement/EntitlementPredicates.java +++ b/core/src/main/java/brooklyn/management/entitlement/EntitlementPredicates.java @@ -20,6 +20,9 @@ package brooklyn.management.entitlement; import javax.annotation.Nullable; +import org.apache.brooklyn.management.entitlement.EntitlementClass; +import org.apache.brooklyn.management.entitlement.EntitlementManager; + import com.google.common.base.Predicate; public class EntitlementPredicates { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/entitlement/Entitlements.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/entitlement/Entitlements.java b/core/src/main/java/brooklyn/management/entitlement/Entitlements.java index 16b3924..559eeaa 100644 --- a/core/src/main/java/brooklyn/management/entitlement/Entitlements.java +++ b/core/src/main/java/brooklyn/management/entitlement/Entitlements.java @@ -23,6 +23,11 @@ import java.util.List; import javax.annotation.Nullable; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.entitlement.EntitlementClass; +import org.apache.brooklyn.management.entitlement.EntitlementContext; +import org.apache.brooklyn.management.entitlement.EntitlementManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,8 +46,6 @@ import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.javalang.Reflections; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/entitlement/NotEntitledException.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/entitlement/NotEntitledException.java b/core/src/main/java/brooklyn/management/entitlement/NotEntitledException.java index ca2df14..0816faa 100644 --- a/core/src/main/java/brooklyn/management/entitlement/NotEntitledException.java +++ b/core/src/main/java/brooklyn/management/entitlement/NotEntitledException.java @@ -18,6 +18,9 @@ */ package brooklyn.management.entitlement; +import org.apache.brooklyn.management.entitlement.EntitlementClass; +import org.apache.brooklyn.management.entitlement.EntitlementContext; + public class NotEntitledException extends RuntimeException { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManager.java b/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManager.java index 337ffe0..752c7b2 100644 --- a/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManager.java +++ b/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManager.java @@ -20,6 +20,9 @@ package brooklyn.management.entitlement; import java.util.Map; +import org.apache.brooklyn.management.entitlement.EntitlementClass; +import org.apache.brooklyn.management.entitlement.EntitlementContext; +import org.apache.brooklyn.management.entitlement.EntitlementManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManagerWithDefault.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManagerWithDefault.java b/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManagerWithDefault.java index c049b67..9d14f07 100644 --- a/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManagerWithDefault.java +++ b/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManagerWithDefault.java @@ -18,6 +18,8 @@ */ package brooklyn.management.entitlement; +import org.apache.brooklyn.management.entitlement.EntitlementManager; + @Deprecated /** @deprecated since 0.7.0 use {@link PerUserEntitlementManager} */ public class PerUserEntitlementManagerWithDefault extends PerUserEntitlementManager { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/entitlement/WebEntitlementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/entitlement/WebEntitlementContext.java b/core/src/main/java/brooklyn/management/entitlement/WebEntitlementContext.java index 830df8f..ff50167 100644 --- a/core/src/main/java/brooklyn/management/entitlement/WebEntitlementContext.java +++ b/core/src/main/java/brooklyn/management/entitlement/WebEntitlementContext.java @@ -18,6 +18,8 @@ */ package brooklyn.management.entitlement; +import org.apache.brooklyn.management.entitlement.EntitlementContext; + import brooklyn.util.javalang.JavaClassNames; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/ha/BasicMasterChooser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/ha/BasicMasterChooser.java b/core/src/main/java/brooklyn/management/ha/BasicMasterChooser.java index 47ebf43..b55569e 100644 --- a/core/src/main/java/brooklyn/management/ha/BasicMasterChooser.java +++ b/core/src/main/java/brooklyn/management/ha/BasicMasterChooser.java @@ -22,6 +22,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java b/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java index edb16c7..3379b92 100644 --- a/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java +++ b/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java @@ -29,6 +29,15 @@ import java.util.concurrent.Callable; import javax.annotation.Nullable; +import org.apache.brooklyn.management.Task; +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.ManagementNodeSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecordPersister; +import org.apache.brooklyn.management.ha.MementoCopyMode; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecordPersister.Delta; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,9 +61,7 @@ import brooklyn.entity.rebind.plane.dto.ManagementPlaneSyncRecordImpl; import brooklyn.entity.rebind.plane.dto.ManagementPlaneSyncRecordImpl.Builder; import brooklyn.internal.BrooklynFeatureEnablement; import brooklyn.location.Location; -import brooklyn.management.Task; import brooklyn.management.ha.BasicMasterChooser.AlphabeticMasterChooser; -import brooklyn.management.ha.ManagementPlaneSyncRecordPersister.Delta; import brooklyn.management.internal.BrooklynObjectManagementMode; import brooklyn.management.internal.LocalEntityManager; import brooklyn.management.internal.LocationManagerInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/ha/ManagementPlaneSyncRecordDeltaImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/ha/ManagementPlaneSyncRecordDeltaImpl.java b/core/src/main/java/brooklyn/management/ha/ManagementPlaneSyncRecordDeltaImpl.java index 5e07b19..98bdb42 100644 --- a/core/src/main/java/brooklyn/management/ha/ManagementPlaneSyncRecordDeltaImpl.java +++ b/core/src/main/java/brooklyn/management/ha/ManagementPlaneSyncRecordDeltaImpl.java @@ -23,7 +23,8 @@ import static com.google.common.base.Preconditions.checkState; import java.util.Collection; -import brooklyn.management.ha.ManagementPlaneSyncRecordPersister.Delta; +import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecordPersister.Delta; import com.google.common.annotations.Beta; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java b/core/src/main/java/brooklyn/management/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java index 07063ff..09abb2f 100644 --- a/core/src/main/java/brooklyn/management/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java +++ b/core/src/main/java/brooklyn/management/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java @@ -27,6 +27,12 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecordPersister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +44,6 @@ import brooklyn.entity.rebind.persister.StoreObjectAccessorLocking; import brooklyn.entity.rebind.persister.XmlMementoSerializer; import brooklyn.entity.rebind.plane.dto.BasicManagementNodeSyncRecord; import brooklyn.entity.rebind.plane.dto.ManagementPlaneSyncRecordImpl; -import brooklyn.management.ManagementContext; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.text.Strings; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/ha/MasterChooser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/ha/MasterChooser.java b/core/src/main/java/brooklyn/management/ha/MasterChooser.java index 2e6facd..1c47dbc 100644 --- a/core/src/main/java/brooklyn/management/ha/MasterChooser.java +++ b/core/src/main/java/brooklyn/management/ha/MasterChooser.java @@ -18,6 +18,9 @@ */ package brooklyn.management.ha; +import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; + 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/management/ha/OsgiManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/ha/OsgiManager.java b/core/src/main/java/brooklyn/management/ha/OsgiManager.java index 53c3053..1f8e243 100644 --- a/core/src/main/java/brooklyn/management/ha/OsgiManager.java +++ b/core/src/main/java/brooklyn/management/ha/OsgiManager.java @@ -36,11 +36,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.BrooklynVersion; + import org.apache.brooklyn.catalog.CatalogItem.CatalogBundle; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.config.BrooklynServerConfig; import brooklyn.config.BrooklynServerPaths; import brooklyn.config.ConfigKey; -import brooklyn.management.ManagementContext; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java b/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java index 3cd64da..7115eb1 100644 --- a/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java +++ b/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java @@ -36,8 +36,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynObject; + import org.apache.brooklyn.catalog.BrooklynCatalog; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.SubscriptionContext; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; +import org.apache.brooklyn.management.entitlement.EntitlementManager; +import org.apache.brooklyn.management.ha.HighAvailabilityManager; + import brooklyn.catalog.internal.BasicBrooklynCatalog; import brooklyn.catalog.internal.CatalogInitialization; import brooklyn.catalog.internal.CatalogUtils; @@ -61,15 +70,8 @@ import brooklyn.internal.storage.impl.BrooklynStorageImpl; import brooklyn.internal.storage.impl.inmemory.InMemoryDataGridFactory; import brooklyn.location.LocationRegistry; import brooklyn.location.basic.BasicLocationRegistry; -import brooklyn.management.ExecutionContext; -import brooklyn.management.ManagementContext; -import brooklyn.management.SubscriptionContext; -import brooklyn.management.Task; -import brooklyn.management.classloading.BrooklynClassLoadingContext; import brooklyn.management.classloading.JavaBrooklynClassLoadingContext; -import brooklyn.management.entitlement.EntitlementManager; import brooklyn.management.entitlement.Entitlements; -import brooklyn.management.ha.HighAvailabilityManager; import brooklyn.management.ha.HighAvailabilityManagerImpl; import brooklyn.util.GroovyJavaMethods; import brooklyn.util.ResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/internal/AbstractSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/AbstractSubscriptionManager.java b/core/src/main/java/brooklyn/management/internal/AbstractSubscriptionManager.java index 8b83d9e..db360b1 100644 --- a/core/src/main/java/brooklyn/management/internal/AbstractSubscriptionManager.java +++ b/core/src/main/java/brooklyn/management/internal/AbstractSubscriptionManager.java @@ -23,6 +23,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collections; import java.util.Map; +import org.apache.brooklyn.management.SubscriptionHandle; +import org.apache.brooklyn.management.SubscriptionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,8 +33,6 @@ import brooklyn.entity.Group; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.management.SubscriptionHandle; -import brooklyn.management.SubscriptionManager; import com.google.common.base.Objects; 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/AccessManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/AccessManager.java b/core/src/main/java/brooklyn/management/internal/AccessManager.java index 04c4e8d..ca2c11d 100644 --- a/core/src/main/java/brooklyn/management/internal/AccessManager.java +++ b/core/src/main/java/brooklyn/management/internal/AccessManager.java @@ -18,7 +18,7 @@ */ package brooklyn.management.internal; -import brooklyn.management.AccessController; +import org.apache.brooklyn.management.AccessController; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/internal/AsyncCollectionChangeAdapter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/AsyncCollectionChangeAdapter.java b/core/src/main/java/brooklyn/management/internal/AsyncCollectionChangeAdapter.java index 8b583d4..02113d0 100644 --- a/core/src/main/java/brooklyn/management/internal/AsyncCollectionChangeAdapter.java +++ b/core/src/main/java/brooklyn/management/internal/AsyncCollectionChangeAdapter.java @@ -20,10 +20,10 @@ package brooklyn.management.internal; import static com.google.common.base.Preconditions.checkNotNull; +import org.apache.brooklyn.management.ExecutionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.management.ExecutionManager; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.task.BasicExecutionManager; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/internal/BasicSubscriptionContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/BasicSubscriptionContext.java b/core/src/main/java/brooklyn/management/internal/BasicSubscriptionContext.java index f61956a..60eaf18 100644 --- a/core/src/main/java/brooklyn/management/internal/BasicSubscriptionContext.java +++ b/core/src/main/java/brooklyn/management/internal/BasicSubscriptionContext.java @@ -26,6 +26,9 @@ import java.util.Collections; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.management.SubscriptionContext; +import org.apache.brooklyn.management.SubscriptionHandle; +import org.apache.brooklyn.management.SubscriptionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,9 +37,6 @@ import brooklyn.entity.Group; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.management.SubscriptionContext; -import brooklyn.management.SubscriptionHandle; -import brooklyn.management.SubscriptionManager; import com.google.common.base.Objects; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/internal/BrooklynGarbageCollector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/BrooklynGarbageCollector.java b/core/src/main/java/brooklyn/management/internal/BrooklynGarbageCollector.java index 68c96dc..55407d0 100644 --- a/core/src/main/java/brooklyn/management/internal/BrooklynGarbageCollector.java +++ b/core/src/main/java/brooklyn/management/internal/BrooklynGarbageCollector.java @@ -35,6 +35,8 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.management.HasTaskChildren; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,8 +50,6 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.internal.storage.BrooklynStorage; import brooklyn.location.Location; -import brooklyn.management.HasTaskChildren; -import brooklyn.management.Task; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/internal/EffectorUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/EffectorUtils.java b/core/src/main/java/brooklyn/management/internal/EffectorUtils.java index 556ca23..4f78a95 100644 --- a/core/src/main/java/brooklyn/management/internal/EffectorUtils.java +++ b/core/src/main/java/brooklyn/management/internal/EffectorUtils.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +39,6 @@ import brooklyn.entity.ParameterType; import brooklyn.entity.basic.BasicParameterType; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.EntityInternal; -import brooklyn.management.Task; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java b/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java index 1516e0f..3dc76b1 100644 --- a/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java +++ b/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java @@ -23,6 +23,10 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.SubscriptionContext; +import org.apache.brooklyn.management.entitlement.EntitlementManager; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; import org.slf4j.Logger; @@ -37,10 +41,6 @@ import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.event.AttributeSensor; -import brooklyn.management.ExecutionContext; -import brooklyn.management.ManagementContext; -import brooklyn.management.SubscriptionContext; -import brooklyn.management.entitlement.EntitlementManager; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.Entitlements.EntityAndItem; import brooklyn.management.entitlement.Entitlements.StringAndArgument; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/internal/EntityManagementUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/EntityManagementUtils.java b/core/src/main/java/brooklyn/management/internal/EntityManagementUtils.java index 07ab79a..4b0e257 100644 --- a/core/src/main/java/brooklyn/management/internal/EntityManagementUtils.java +++ b/core/src/main/java/brooklyn/management/internal/EntityManagementUtils.java @@ -30,6 +30,9 @@ import java.util.concurrent.Callable; import javax.annotation.Nullable; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,9 +49,6 @@ import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.effector.Effectors; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; -import brooklyn.management.classloading.BrooklynClassLoadingContext; import brooklyn.management.classloading.JavaBrooklynClassLoadingContext; 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/management/internal/EntityManagerInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/EntityManagerInternal.java b/core/src/main/java/brooklyn/management/internal/EntityManagerInternal.java index d3a619b..de64668 100644 --- a/core/src/main/java/brooklyn/management/internal/EntityManagerInternal.java +++ b/core/src/main/java/brooklyn/management/internal/EntityManagerInternal.java @@ -18,9 +18,10 @@ */ package brooklyn.management.internal; +import org.apache.brooklyn.management.EntityManager; + import brooklyn.entity.Application; import brooklyn.entity.Entity; -import brooklyn.management.EntityManager; public interface EntityManagerInternal extends EntityManager, BrooklynObjectManagerInternal<Entity> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/main/java/brooklyn/management/internal/LocalAccessManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/LocalAccessManager.java b/core/src/main/java/brooklyn/management/internal/LocalAccessManager.java index 077e56f..8a8918f 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalAccessManager.java +++ b/core/src/main/java/brooklyn/management/internal/LocalAccessManager.java @@ -20,9 +20,10 @@ package brooklyn.management.internal; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.management.AccessController; + import brooklyn.entity.Entity; import brooklyn.location.Location; -import brooklyn.management.AccessController; import com.google.common.annotations.Beta;
