http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java b/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java index 5afbec3..b43e32f 100644 --- a/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java +++ b/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java @@ -159,7 +159,7 @@ public class InternalEntityFactory extends InternalFactory { * fully initialized ({@link AbstractEntity#init()} invoked) and ready for * management -- commonly the caller will next call * {@link Entities#manage(Entity)} (if it's in a managed application) - * or {@link Entities#startManagement(org.apache.brooklyn.api.entity.Application, org.apache.brooklyn.management.ManagementContext)} + * or {@link Entities#startManagement(org.apache.brooklyn.api.entity.Application, org.apache.brooklyn.api.management.ManagementContext)} * (if it's an application) */ public <T extends Entity> T createEntity(EntitySpec<T> spec) { /* Order is important here. Changed Jul 2014 when supporting children in spec.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java b/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java index 2396718..3c665f6 100644 --- a/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java +++ b/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java @@ -22,7 +22,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.Map; import java.util.Map.Entry; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java b/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java index a2549b6..dc79c9a 100644 --- a/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java +++ b/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java @@ -21,7 +21,7 @@ package brooklyn.entity.proxying; import java.util.Map; import org.apache.brooklyn.api.entity.Feed; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.Policy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java b/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java index ead37a3..c8d0d85 100644 --- a/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java @@ -29,7 +29,7 @@ import org.apache.brooklyn.api.basic.BrooklynObject; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; -import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.mementos.BrooklynMementoPersister; import org.apache.brooklyn.mementos.BrooklynMementoRawData; import org.apache.brooklyn.mementos.Memento; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 dbe28d6..33cc05b 100644 --- a/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; -import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.mementos.BrooklynMementoPersister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 06dc029..8b68aec 100644 --- a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java +++ b/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java @@ -39,8 +39,8 @@ import org.apache.brooklyn.api.entity.Feed; import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.entity.rebind.ChangeListener; import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; -import org.apache.brooklyn.management.ExecutionContext; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.mementos.BrooklynMementoPersister; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 1d3768b..85f4851 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java @@ -29,7 +29,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Feed; import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 e8d27d6..98e0586 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java @@ -29,7 +29,7 @@ import org.apache.brooklyn.api.entity.Feed; import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 1f3f0cb..bd33c1b 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java @@ -46,8 +46,8 @@ import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.api.entity.rebind.RebindSupport; -import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; -import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.mementos.BrooklynMemento; import org.apache.brooklyn.mementos.BrooklynMementoManifest; import org.apache.brooklyn.mementos.BrooklynMementoPersister; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 1722d60..a7b31c7 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java @@ -36,10 +36,10 @@ import org.apache.brooklyn.api.entity.rebind.ChangeListener; import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.api.entity.rebind.RebindManager; -import org.apache.brooklyn.management.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.api.management.ExecutionContext; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.MementoCopyMode; import org.apache.brooklyn.mementos.BrooklynMementoPersister; import org.apache.brooklyn.mementos.BrooklynMementoRawData; import org.apache.brooklyn.mementos.TreeNode; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 5399ed9..c65444f 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java @@ -35,8 +35,8 @@ import org.apache.brooklyn.api.entity.Feed; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.AttributeSensor.SensorPersistenceMode; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.mementos.BrooklynMemento; import org.apache.brooklyn.mementos.CatalogItemMemento; import org.apache.brooklyn.mementos.EnricherMemento; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 a1eb8e5..f52f2d2 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java @@ -31,11 +31,11 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Feed; import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; -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.api.management.ManagementContext; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.api.management.ha.MementoCopyMode; import org.apache.brooklyn.mementos.BrooklynMementoRawData; import org.apache.brooklyn.mementos.Memento; import org.apache.brooklyn.policy.Enricher; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 8e9820f..c1df659 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java @@ -34,8 +34,8 @@ 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.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 63284de..45e0065 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/MementoSerializer.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/MementoSerializer.java @@ -18,7 +18,7 @@ */ package brooklyn.entity.rebind.persister; -import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; import org.apache.brooklyn.mementos.BrooklynMemento; import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 50a4eaa..fa11299 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,8 @@ import java.util.List; import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.ReadWriteLock; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 e3780d40..e78af93 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java @@ -35,9 +35,9 @@ import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Feed; import org.apache.brooklyn.api.entity.trait.Identifiable; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 fe2dc7b..a6f8766 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,8 +21,8 @@ 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.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 977e83d..920f402 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,8 @@ import static com.google.common.base.Preconditions.checkState; import java.io.Serializable; import java.util.Map; -import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; -import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 73970f8..b89a018 100644 --- a/core/src/main/java/brooklyn/entity/trait/StartableMethods.java +++ b/core/src/main/java/brooklyn/entity/trait/StartableMethods.java @@ -24,7 +24,7 @@ import java.util.List; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; -import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.api.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 502a895..a1ad815 100644 --- a/core/src/main/java/brooklyn/event/basic/AbstractCollectionConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/AbstractCollectionConfigKey.java @@ -22,8 +22,8 @@ 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.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.api.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 ac90a14..c945049 100644 --- a/core/src/main/java/brooklyn/event/basic/AbstractStructuredConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/AbstractStructuredConfigKey.java @@ -21,7 +21,7 @@ package brooklyn.event.basic; import java.util.Map; import java.util.concurrent.ExecutionException; -import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.api.management.ExecutionContext; import brooklyn.config.ConfigKey; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 9d4d638..fda8063 100644 --- a/core/src/main/java/brooklyn/event/basic/AttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/AttributeSensorAndConfigKey.java @@ -21,7 +21,7 @@ package brooklyn.event.basic; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.Sensor; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/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 69bf22a..0be4867 100644 --- a/core/src/main/java/brooklyn/event/basic/BasicAttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/BasicAttributeSensorAndConfigKey.java @@ -20,7 +20,7 @@ package brooklyn.event.basic; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.Sensor; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 9c87274..1e41aad 100644 --- a/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java @@ -27,7 +27,7 @@ import java.util.concurrent.ExecutionException; import javax.annotation.Nullable; -import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.api.management.ExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 e9a3798..44d8688 100644 --- a/core/src/main/java/brooklyn/event/basic/DependentConfiguration.java +++ b/core/src/main/java/brooklyn/event/basic/DependentConfiguration.java @@ -39,11 +39,11 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; -import org.apache.brooklyn.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.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.api.management.SubscriptionHandle; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.TaskAdaptable; +import org.apache.brooklyn.api.management.TaskFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 41d15df..bb3df39 100644 --- a/core/src/main/java/brooklyn/event/basic/MapConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/MapConfigKey.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutionException; -import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.api.management.ExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 1fdba28..9611bd5 100644 --- a/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java @@ -23,7 +23,7 @@ import java.util.Iterator; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.Sensor; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/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 e98dc16..3fd023c 100644 --- a/core/src/main/java/brooklyn/event/basic/SubElementConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/SubElementConfigKey.java @@ -20,7 +20,7 @@ package brooklyn.event.basic; import java.util.Map; -import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.api.management.ExecutionContext; import brooklyn.config.ConfigKey; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 cd0ce99..d5e46cf 100644 --- a/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java @@ -19,7 +19,7 @@ package brooklyn.event.basic; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 153a470..5ed845b 100644 --- a/core/src/main/java/brooklyn/event/feed/ConfigToAttributes.java +++ b/core/src/main/java/brooklyn/event/feed/ConfigToAttributes.java @@ -20,7 +20,7 @@ package brooklyn.event.feed; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.Sensor; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.event.basic.AttributeSensorAndConfigKey; import brooklyn.event.basic.TemplatedStringAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 96ce376..1bd97cd 100644 --- a/core/src/main/java/brooklyn/event/feed/Poller.java +++ b/core/src/main/java/brooklyn/event/feed/Poller.java @@ -23,7 +23,7 @@ import java.util.Set; import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.basic.EntityLocal; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 25883c8..7362666 100644 --- a/core/src/main/java/brooklyn/event/feed/shell/ShellFeed.java +++ b/core/src/main/java/brooklyn/event/feed/shell/ShellFeed.java @@ -28,7 +28,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.basic.EntityLocal; -import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.api.management.ExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 395cfe3..04f87ba 100644 --- a/core/src/main/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeed.java +++ b/core/src/main/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeed.java @@ -37,7 +37,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.AttributeSensor; -import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.api.management.ExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 c444630..10a6e4a 100644 --- a/core/src/main/java/brooklyn/internal/BrooklynFeatureEnablement.java +++ b/core/src/main/java/brooklyn/internal/BrooklynFeatureEnablement.java @@ -20,7 +20,7 @@ package brooklyn.internal; import java.util.Map; -import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 cac5f5b..a5eb1cc 100644 --- a/core/src/main/java/brooklyn/location/basic/AbstractLocation.java +++ b/core/src/main/java/brooklyn/location/basic/AbstractLocation.java @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.entity.trait.Configurable; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.mementos.LocationMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 dc4b65d..f2799df 100644 --- a/core/src/main/java/brooklyn/location/basic/AbstractLocationResolver.java +++ b/core/src/main/java/brooklyn/location/basic/AbstractLocationResolver.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/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 89415b5..c0169d6 100644 --- a/core/src/main/java/brooklyn/location/basic/BasicLocationRegistry.java +++ b/core/src/main/java/brooklyn/location/basic/BasicLocationRegistry.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.catalog.BrooklynCatalog; import org.apache.brooklyn.api.catalog.CatalogItem; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.catalog.CatalogPredicates; import brooklyn.config.ConfigMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 873a0b2..543db37 100644 --- a/core/src/main/java/brooklyn/location/basic/BasicMachineDetails.java +++ b/core/src/main/java/brooklyn/location/basic/BasicMachineDetails.java @@ -28,7 +28,7 @@ import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.concurrent.Immutable; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 0e939d2..a036c85 100644 --- a/core/src/main/java/brooklyn/location/basic/CatalogLocationResolver.java +++ b/core/src/main/java/brooklyn/location/basic/CatalogLocationResolver.java @@ -25,7 +25,7 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.catalog.CatalogItem; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 ab51b6b..62aaf66 100644 --- a/core/src/main/java/brooklyn/location/basic/DefinedLocationByIdResolver.java +++ b/core/src/main/java/brooklyn/location/basic/DefinedLocationByIdResolver.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/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 f6f7e67..73766c2 100644 --- a/core/src/main/java/brooklyn/location/basic/FixedListMachineProvisioningLocation.java +++ b/core/src/main/java/brooklyn/location/basic/FixedListMachineProvisioningLocation.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.brooklyn.management.LocationManager; +import org.apache.brooklyn.api.management.LocationManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 9f7bfa2..9949947 100644 --- a/core/src/main/java/brooklyn/location/basic/LocationConfigUtils.java +++ b/core/src/main/java/brooklyn/location/basic/LocationConfigUtils.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/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 02c9332..e846cd3 100644 --- a/core/src/main/java/brooklyn/location/basic/LocationInternal.java +++ b/core/src/main/java/brooklyn/location/basic/LocationInternal.java @@ -21,7 +21,7 @@ package brooklyn.location.basic; import java.util.Map; import org.apache.brooklyn.api.entity.rebind.RebindSupport; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.mementos.LocationMemento; import brooklyn.basic.BrooklynObjectInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 580b3b3..73221ca 100644 --- a/core/src/main/java/brooklyn/location/basic/Locations.java +++ b/core/src/main/java/brooklyn/location/basic/Locations.java @@ -25,8 +25,8 @@ import java.util.List; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.LocationManager; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.LocationManager; +import org.apache.brooklyn.api.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/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 bfe90f7..8804e48 100644 --- a/core/src/main/java/brooklyn/location/basic/MultiLocation.java +++ b/core/src/main/java/brooklyn/location/basic/MultiLocation.java @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 96c2981..87219b5 100644 --- a/core/src/main/java/brooklyn/location/basic/MultiLocationResolver.java +++ b/core/src/main/java/brooklyn/location/basic/MultiLocationResolver.java @@ -26,7 +26,7 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/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 3cdb310..b936c93 100644 --- a/core/src/main/java/brooklyn/location/basic/NamedLocationResolver.java +++ b/core/src/main/java/brooklyn/location/basic/NamedLocationResolver.java @@ -23,7 +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.apache.brooklyn.api.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/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 5e8b8c4..1b66761 100644 --- a/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java +++ b/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java @@ -45,7 +45,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 197f39b..216fcc1 100644 --- a/core/src/main/java/brooklyn/location/cloud/AbstractAvailabilityZoneExtension.java +++ b/core/src/main/java/brooklyn/location/cloud/AbstractAvailabilityZoneExtension.java @@ -24,7 +24,7 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 a8d0a83..772dee3 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 org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; /** * Provides a way for the {@link ManagementContext} to be injected directly. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 b1696c4..fc975eb 100644 --- a/core/src/main/java/brooklyn/management/classloading/AbstractBrooklynClassLoadingContext.java +++ b/core/src/main/java/brooklyn/management/classloading/AbstractBrooklynClassLoadingContext.java @@ -2,8 +2,8 @@ package brooklyn.management.classloading; import javax.annotation.Nullable; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; import brooklyn.util.guava.Maybe; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 bd8bc59..a1270bc 100644 --- a/core/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContextSequential.java +++ b/core/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContextSequential.java @@ -22,8 +22,8 @@ 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.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 c4d4cde..104b3a1 100644 --- a/core/src/main/java/brooklyn/management/classloading/ClassLoaderFromBrooklynClassLoadingContext.java +++ b/core/src/main/java/brooklyn/management/classloading/ClassLoaderFromBrooklynClassLoadingContext.java @@ -20,7 +20,7 @@ package brooklyn.management.classloading; import java.net.URL; -import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; +import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; public class ClassLoaderFromBrooklynClassLoadingContext extends ClassLoader { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 79b173f..32e5c1b 100644 --- a/core/src/main/java/brooklyn/management/classloading/JavaBrooklynClassLoadingContext.java +++ b/core/src/main/java/brooklyn/management/classloading/JavaBrooklynClassLoadingContext.java @@ -26,7 +26,7 @@ import java.net.URL; import java.util.Collections; import java.util.Enumeration; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 1ecf9f5..027ccc3 100644 --- a/core/src/main/java/brooklyn/management/classloading/OsgiBrooklynClassLoadingContext.java +++ b/core/src/main/java/brooklyn/management/classloading/OsgiBrooklynClassLoadingContext.java @@ -24,8 +24,8 @@ import java.util.Collections; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.catalog.CatalogItem.CatalogBundle; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.entitlement.EntitlementClass; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.entitlement.EntitlementClass; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.management.entitlement.Entitlements; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 4ce16e2..dc41aa3 100644 --- a/core/src/main/java/brooklyn/management/entitlement/BasicEntitlementClassDefinition.java +++ b/core/src/main/java/brooklyn/management/entitlement/BasicEntitlementClassDefinition.java @@ -18,7 +18,7 @@ */ package brooklyn.management.entitlement; -import org.apache.brooklyn.management.entitlement.EntitlementClass; +import org.apache.brooklyn.api.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/2e2de8e4/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 3f9c409..0eeb4ba 100644 --- a/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java +++ b/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java @@ -19,9 +19,9 @@ package brooklyn.management.entitlement; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.entitlement.EntitlementClass; -import org.apache.brooklyn.management.entitlement.EntitlementContext; -import org.apache.brooklyn.management.entitlement.EntitlementManager; +import org.apache.brooklyn.api.management.entitlement.EntitlementClass; +import org.apache.brooklyn.api.management.entitlement.EntitlementContext; +import org.apache.brooklyn.api.management.entitlement.EntitlementManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 5b006f8..75bc5dd 100644 --- a/core/src/main/java/brooklyn/management/entitlement/EntitlementPredicates.java +++ b/core/src/main/java/brooklyn/management/entitlement/EntitlementPredicates.java @@ -20,8 +20,8 @@ package brooklyn.management.entitlement; import javax.annotation.Nullable; -import org.apache.brooklyn.management.entitlement.EntitlementClass; -import org.apache.brooklyn.management.entitlement.EntitlementManager; +import org.apache.brooklyn.api.management.entitlement.EntitlementClass; +import org.apache.brooklyn.api.management.entitlement.EntitlementManager; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 ffb6d79..28a9a84 100644 --- a/core/src/main/java/brooklyn/management/entitlement/Entitlements.java +++ b/core/src/main/java/brooklyn/management/entitlement/Entitlements.java @@ -24,11 +24,11 @@ import java.util.List; import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.entitlement.EntitlementClass; -import org.apache.brooklyn.management.entitlement.EntitlementContext; -import org.apache.brooklyn.management.entitlement.EntitlementManager; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.entitlement.EntitlementClass; +import org.apache.brooklyn.api.management.entitlement.EntitlementContext; +import org.apache.brooklyn.api.management.entitlement.EntitlementManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 0816faa..f63b7e3 100644 --- a/core/src/main/java/brooklyn/management/entitlement/NotEntitledException.java +++ b/core/src/main/java/brooklyn/management/entitlement/NotEntitledException.java @@ -18,8 +18,8 @@ */ package brooklyn.management.entitlement; -import org.apache.brooklyn.management.entitlement.EntitlementClass; -import org.apache.brooklyn.management.entitlement.EntitlementContext; +import org.apache.brooklyn.api.management.entitlement.EntitlementClass; +import org.apache.brooklyn.api.management.entitlement.EntitlementContext; public class NotEntitledException extends RuntimeException { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 752c7b2..ab9a90f 100644 --- a/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManager.java +++ b/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManager.java @@ -20,9 +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.apache.brooklyn.api.management.entitlement.EntitlementClass; +import org.apache.brooklyn.api.management.entitlement.EntitlementContext; +import org.apache.brooklyn.api.management.entitlement.EntitlementManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 9d14f07..95f254f 100644 --- a/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManagerWithDefault.java +++ b/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManagerWithDefault.java @@ -18,7 +18,7 @@ */ package brooklyn.management.entitlement; -import org.apache.brooklyn.management.entitlement.EntitlementManager; +import org.apache.brooklyn.api.management.entitlement.EntitlementManager; @Deprecated /** @deprecated since 0.7.0 use {@link PerUserEntitlementManager} */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 ff50167..f6db50d 100644 --- a/core/src/main/java/brooklyn/management/entitlement/WebEntitlementContext.java +++ b/core/src/main/java/brooklyn/management/entitlement/WebEntitlementContext.java @@ -18,7 +18,7 @@ */ package brooklyn.management.entitlement; -import org.apache.brooklyn.management.entitlement.EntitlementContext; +import org.apache.brooklyn.api.management.entitlement.EntitlementContext; import brooklyn.util.javalang.JavaClassNames; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 98ab862..a44c372 100644 --- a/core/src/main/java/brooklyn/management/ha/BasicMasterChooser.java +++ b/core/src/main/java/brooklyn/management/ha/BasicMasterChooser.java @@ -23,9 +23,9 @@ import java.util.Collections; import java.util.List; import org.apache.brooklyn.api.entity.trait.Identifiable; -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.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 8ebbc76..8481e6e 100644 --- a/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java +++ b/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java @@ -32,15 +32,15 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.rebind.RebindManager; -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.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.ha.HighAvailabilityManager; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister; +import org.apache.brooklyn.api.management.ha.MementoCopyMode; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister.Delta; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 98bdb42..029ffb0 100644 --- a/core/src/main/java/brooklyn/management/ha/ManagementPlaneSyncRecordDeltaImpl.java +++ b/core/src/main/java/brooklyn/management/ha/ManagementPlaneSyncRecordDeltaImpl.java @@ -23,8 +23,8 @@ import static com.google.common.base.Preconditions.checkState; import java.util.Collection; -import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; -import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecordPersister.Delta; +import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.api.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/2e2de8e4/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 09abb2f..dff815e 100644 --- a/core/src/main/java/brooklyn/management/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java +++ b/core/src/main/java/brooklyn/management/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java @@ -27,12 +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.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 1c47dbc..fdde8b9 100644 --- a/core/src/main/java/brooklyn/management/ha/MasterChooser.java +++ b/core/src/main/java/brooklyn/management/ha/MasterChooser.java @@ -18,8 +18,8 @@ */ package brooklyn.management.ha; -import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; -import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 e136a72..fd98ed2 100644 --- a/core/src/main/java/brooklyn/management/ha/OsgiManager.java +++ b/core/src/main/java/brooklyn/management/ha/OsgiManager.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; import brooklyn.BrooklynVersion; import org.apache.brooklyn.api.catalog.CatalogItem.CatalogBundle; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.BrooklynServerPaths; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 85f3d6d..b85e133 100644 --- a/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java +++ b/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java @@ -42,13 +42,13 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.drivers.EntityDriverManager; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager; import org.apache.brooklyn.api.entity.rebind.RebindManager; -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 org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.SubscriptionContext; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; +import org.apache.brooklyn.api.management.entitlement.EntitlementManager; +import org.apache.brooklyn.api.management.ha.HighAvailabilityManager; import brooklyn.catalog.internal.BasicBrooklynCatalog; import brooklyn.catalog.internal.CatalogInitialization; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 04896e6..7e8effc 100644 --- a/core/src/main/java/brooklyn/management/internal/AbstractSubscriptionManager.java +++ b/core/src/main/java/brooklyn/management/internal/AbstractSubscriptionManager.java @@ -28,8 +28,8 @@ import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; -import org.apache.brooklyn.management.SubscriptionHandle; -import org.apache.brooklyn.management.SubscriptionManager; +import org.apache.brooklyn.api.management.SubscriptionHandle; +import org.apache.brooklyn.api.management.SubscriptionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 ca2c11d..baa805a 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 org.apache.brooklyn.management.AccessController; +import org.apache.brooklyn.api.management.AccessController; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 02113d0..e3e5193 100644 --- a/core/src/main/java/brooklyn/management/internal/AsyncCollectionChangeAdapter.java +++ b/core/src/main/java/brooklyn/management/internal/AsyncCollectionChangeAdapter.java @@ -20,7 +20,7 @@ package brooklyn.management.internal; import static com.google.common.base.Preconditions.checkNotNull; -import org.apache.brooklyn.management.ExecutionManager; +import org.apache.brooklyn.api.management.ExecutionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 7f4b0fc..cb60545 100644 --- a/core/src/main/java/brooklyn/management/internal/BasicSubscriptionContext.java +++ b/core/src/main/java/brooklyn/management/internal/BasicSubscriptionContext.java @@ -31,9 +31,9 @@ import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; -import org.apache.brooklyn.management.SubscriptionContext; -import org.apache.brooklyn.management.SubscriptionHandle; -import org.apache.brooklyn.management.SubscriptionManager; +import org.apache.brooklyn.api.management.SubscriptionContext; +import org.apache.brooklyn.api.management.SubscriptionHandle; +import org.apache.brooklyn.api.management.SubscriptionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 2a4de29..fdf2803 100644 --- a/core/src/main/java/brooklyn/management/internal/BrooklynGarbageCollector.java +++ b/core/src/main/java/brooklyn/management/internal/BrooklynGarbageCollector.java @@ -36,8 +36,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.HasTaskChildren; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.HasTaskChildren; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 6562f0a..fe38cb6 100644 --- a/core/src/main/java/brooklyn/management/internal/EffectorUtils.java +++ b/core/src/main/java/brooklyn/management/internal/EffectorUtils.java @@ -32,7 +32,7 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.ParameterType; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 62b9aa4..ad65a96 100644 --- a/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java +++ b/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java @@ -28,10 +28,10 @@ import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Feed; import org.apache.brooklyn.api.event.AttributeSensor; -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.api.management.ExecutionContext; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.SubscriptionContext; +import org.apache.brooklyn.api.management.entitlement.EntitlementManager; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 d19f701..24ece98 100644 --- a/core/src/main/java/brooklyn/management/internal/EntityManagementUtils.java +++ b/core/src/main/java/brooklyn/management/internal/EntityManagementUtils.java @@ -34,9 +34,9 @@ import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 56ca88c..aa55b59 100644 --- a/core/src/main/java/brooklyn/management/internal/EntityManagerInternal.java +++ b/core/src/main/java/brooklyn/management/internal/EntityManagerInternal.java @@ -20,7 +20,7 @@ package brooklyn.management.internal; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.EntityManager; +import org.apache.brooklyn.api.management.EntityManager; public interface EntityManagerInternal extends EntityManager, BrooklynObjectManagerInternal<Entity> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 3a83d90..d169e33 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalAccessManager.java +++ b/core/src/main/java/brooklyn/management/internal/LocalAccessManager.java @@ -21,7 +21,7 @@ package brooklyn.management.internal; import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.AccessController; +import org.apache.brooklyn.api.management.AccessController; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 fb21f20..ed9429e 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java +++ b/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java @@ -37,8 +37,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.EntityTypeRegistry; -import org.apache.brooklyn.management.AccessController; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.AccessController; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.Policy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/management/internal/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 31d90fc..cb9a7e2 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java +++ b/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java @@ -25,7 +25,7 @@ import java.util.Collection; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; -import org.apache.brooklyn.management.AccessController; +import org.apache.brooklyn.api.management.AccessController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 1b007fb..beb568f 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalManagementContext.java +++ b/core/src/main/java/brooklyn/management/internal/LocalManagementContext.java @@ -34,13 +34,13 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; -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.apache.brooklyn.api.management.AccessController; +import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.api.management.ExecutionManager; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.SubscriptionManager; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 b88d5b2..c2c7905 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalSubscriptionManager.java +++ b/core/src/main/java/brooklyn/management/internal/LocalSubscriptionManager.java @@ -37,9 +37,9 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; -import org.apache.brooklyn.management.ExecutionManager; -import org.apache.brooklyn.management.SubscriptionHandle; -import org.apache.brooklyn.management.SubscriptionManager; +import org.apache.brooklyn.api.management.ExecutionManager; +import org.apache.brooklyn.api.management.SubscriptionHandle; +import org.apache.brooklyn.api.management.SubscriptionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 4095118..9ae12f5 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalUsageManager.java +++ b/core/src/main/java/brooklyn/management/internal/LocalUsageManager.java @@ -33,7 +33,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.entitlement.EntitlementContext; +import org.apache.brooklyn.api.management.entitlement.EntitlementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/main/java/brooklyn/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 7f3a18b..f36f5df 100644 --- a/core/src/main/java/brooklyn/management/internal/LocationManagerInternal.java +++ b/core/src/main/java/brooklyn/management/internal/LocationManagerInternal.java @@ -18,7 +18,7 @@ */ package brooklyn.management.internal; -import org.apache.brooklyn.management.LocationManager; +import org.apache.brooklyn.api.management.LocationManager; import brooklyn.location.Location;
