http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 a3e6e34..b882cc3 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java @@ -24,14 +24,16 @@ import java.util.Collection; import java.util.Map; import org.apache.brooklyn.api.basic.BrooklynObject; +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.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; -import brooklyn.entity.Entity; -import brooklyn.entity.Feed; import brooklyn.location.Location; import brooklyn.util.collections.MutableMap;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 7974efd..cec9979 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java @@ -23,6 +23,11 @@ import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.basic.BrooklynObject; +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.RebindContext; +import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; @@ -30,8 +35,6 @@ import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; import brooklyn.catalog.internal.CatalogUtils; -import brooklyn.entity.Entity; -import brooklyn.entity.Feed; import brooklyn.location.Location; /** Looks in {@link RebindContext} <i>and</i> {@link ManagementContext} to find entities, locations, etc. */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java b/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java index b2da05a..67f1cf3 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java @@ -27,14 +27,18 @@ import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.basic.BrooklynObject; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Feed; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +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.RebindManager; +import org.apache.brooklyn.api.entity.rebind.RebindManager.RebindFailureMode; import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; -import brooklyn.entity.Entity; -import brooklyn.entity.Feed; -import brooklyn.entity.basic.EntityLocal; -import brooklyn.entity.rebind.RebindManager.RebindFailureMode; import brooklyn.location.Location; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.QuorumCheck; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 f6ffc12..9c7b67d 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java @@ -37,6 +37,13 @@ import brooklyn.basic.AbstractBrooklynObject; import brooklyn.basic.BrooklynObjectInternal; import org.apache.brooklyn.api.basic.BrooklynObject; +import org.apache.brooklyn.api.entity.Application; +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.RebindContext; +import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; +import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.catalog.BrooklynCatalog; import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; @@ -62,9 +69,6 @@ import brooklyn.catalog.internal.CatalogUtils; import brooklyn.config.BrooklynLogging; import brooklyn.config.BrooklynLogging.LoggingLevel; import brooklyn.enricher.basic.AbstractEnricher; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; -import brooklyn.entity.Feed; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.EntityInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 45153f1..1722d60 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java @@ -30,6 +30,12 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.basic.BrooklynObject; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; +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; @@ -43,8 +49,6 @@ import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java b/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java index 1914f9b..04b3585 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java @@ -23,6 +23,9 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.mementos.EntityMemento; import org.apache.brooklyn.mementos.TreeNode; import org.codehaus.jackson.annotate.JsonAutoDetect; @@ -32,13 +35,10 @@ import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynTypes; import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Sanitizer; -import brooklyn.entity.rebind.RebindSupport; import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; import brooklyn.event.basic.Sensors; @@ -52,7 +52,7 @@ import com.google.common.collect.Maps; * * @see AbstractEntity#getRebindSupport() * @see RebindSupport#getMemento() - * @see RebindSupport#reconstruct(brooklyn.entity.rebind.RebindContext, org.apache.brooklyn.mementos.Memento) + * @see RebindSupport#reconstruct(org.apache.brooklyn.api.entity.rebind.RebindContext, org.apache.brooklyn.mementos.Memento) * * @author aled */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoManifestImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoManifestImpl.java b/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoManifestImpl.java index 0f83e21..5ae5e87 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoManifestImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoManifestImpl.java @@ -23,11 +23,10 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; +import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.mementos.BrooklynMementoManifest; import org.apache.brooklyn.mementos.CatalogItemMemento; -import brooklyn.entity.rebind.BrooklynObjectType; - import com.google.common.collect.Maps; public class BrooklynMementoManifestImpl implements BrooklynMementoManifest, Serializable { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 a2bb4cb..e3c60b2 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java @@ -28,6 +28,10 @@ import java.util.Set; import brooklyn.basic.BrooklynTypes; import org.apache.brooklyn.api.basic.BrooklynObject; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Feed; +import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.Task; @@ -46,10 +50,6 @@ import org.apache.brooklyn.policy.Policy; import brooklyn.catalog.internal.CatalogItemDo; import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; -import brooklyn.entity.Feed; -import brooklyn.entity.Group; import brooklyn.entity.basic.EntityDynamicType; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.rebind.AbstractBrooklynObjectRebindSupport; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java index 5cc4daa..8122145 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java @@ -38,6 +38,9 @@ import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.basic.BrooklynObject; +import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; +import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; +import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.mementos.BrooklynMemento; import org.apache.brooklyn.mementos.BrooklynMementoManifest; @@ -50,11 +53,8 @@ import brooklyn.catalog.internal.CatalogUtils; import brooklyn.config.ConfigKey; import brooklyn.config.StringConfigMap; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.rebind.BrooklynObjectType; import brooklyn.entity.rebind.PeriodicDeltaChangeListener; -import brooklyn.entity.rebind.PersistenceExceptionHandler; import brooklyn.entity.rebind.PersisterDeltaImpl; -import brooklyn.entity.rebind.RebindExceptionHandler; import brooklyn.entity.rebind.dto.BrooklynMementoImpl; import brooklyn.entity.rebind.dto.BrooklynMementoManifestImpl; import brooklyn.entity.rebind.persister.PersistenceObjectStore.StoreObjectAccessor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 6e45c22..c433e32 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java @@ -26,6 +26,10 @@ import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynObjectInternal; import org.apache.brooklyn.api.basic.BrooklynObject; +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.catalog.CatalogItem; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.ha.HighAvailabilityMode; @@ -39,12 +43,8 @@ import org.apache.brooklyn.policy.Policy; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.BrooklynServerPaths; -import brooklyn.entity.Entity; -import brooklyn.entity.Feed; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.rebind.BrooklynObjectType; -import brooklyn.entity.rebind.PersistenceExceptionHandler; import brooklyn.entity.rebind.PersistenceExceptionHandlerImpl; import brooklyn.entity.rebind.transformer.CompoundTransformer; import brooklyn.entity.rebind.transformer.CompoundTransformerLoader; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 445ccb2..b85948b 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java @@ -30,6 +30,10 @@ import java.util.concurrent.atomic.AtomicReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.basic.AbstractBrooklynObjectSpec; +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.catalog.CatalogItem; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.Task; @@ -40,9 +44,6 @@ import org.apache.brooklyn.policy.Policy; import brooklyn.catalog.internal.CatalogBundleDto; import brooklyn.catalog.internal.CatalogUtils; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.Feed; import brooklyn.entity.basic.BasicParameterType; import brooklyn.entity.effector.EffectorAndBody; import brooklyn.entity.effector.EffectorTasks.EffectorBodyTaskFactory; @@ -54,7 +55,6 @@ import brooklyn.entity.rebind.dto.BasicFeedMemento; import brooklyn.entity.rebind.dto.BasicLocationMemento; import brooklyn.entity.rebind.dto.BasicPolicyMemento; import brooklyn.entity.rebind.dto.MutableBrooklynMemento; -import brooklyn.entity.trait.Identifiable; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java b/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java index 584b7c2..d7050fb 100644 --- a/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java +++ b/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java @@ -23,10 +23,10 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collection; import java.util.Map; +import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; +import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.mementos.BrooklynMementoRawData; -import brooklyn.entity.rebind.BrooklynObjectType; -import brooklyn.entity.rebind.RebindExceptionHandler; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.transformer.impl.XsltTransformer; import brooklyn.util.ResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/trait/Changeable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/trait/Changeable.java b/core/src/main/java/brooklyn/entity/trait/Changeable.java index e263c55..b131251 100644 --- a/core/src/main/java/brooklyn/entity/trait/Changeable.java +++ b/core/src/main/java/brooklyn/entity/trait/Changeable.java @@ -18,7 +18,8 @@ */ package brooklyn.entity.trait; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/trait/Startable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/trait/Startable.java b/core/src/main/java/brooklyn/entity/trait/Startable.java index 35c6fc1..58ab113 100644 --- a/core/src/main/java/brooklyn/entity/trait/Startable.java +++ b/core/src/main/java/brooklyn/entity/trait/Startable.java @@ -20,11 +20,11 @@ package brooklyn.entity.trait; import java.util.Collection; +import org.apache.brooklyn.api.entity.Effector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; @@ -37,7 +37,7 @@ import brooklyn.util.config.ConfigBag; import brooklyn.util.task.Tasks; /** - * This interface describes an {@link brooklyn.entity.Entity} that can be started and stopped. + * This interface describes an {@link org.apache.brooklyn.api.entity.Entity} that can be started and stopped. * * The {@link Effector}s are {@link #START}, {@link #STOP} and {@link #RESTART}. The start effector takes * a collection of {@link Location} objects as an argument which will cause the entity to be started or stopped in all @@ -81,17 +81,17 @@ public interface Startable { } } - brooklyn.entity.Effector<Void> START = Effectors.effector(new MethodEffector<Void>(Startable.class, "start")) + org.apache.brooklyn.api.entity.Effector<Void> START = Effectors.effector(new MethodEffector<Void>(Startable.class, "start")) // override start to take strings etc .parameter(StartEffectorBody.LOCATIONS) .impl(new StartEffectorBody()) .build(); - brooklyn.entity.Effector<Void> STOP = Effectors.effector(new MethodEffector<Void>(Startable.class, "stop")) + org.apache.brooklyn.api.entity.Effector<Void> STOP = Effectors.effector(new MethodEffector<Void>(Startable.class, "stop")) .impl(new StopEffectorBody()) .build(); - brooklyn.entity.Effector<Void> RESTART = Effectors.effector(new MethodEffector<Void>(Startable.class, "restart")) + org.apache.brooklyn.api.entity.Effector<Void> RESTART = Effectors.effector(new MethodEffector<Void>(Startable.class, "restart")) .impl(new RestartEffectorBody()) .build(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 b43c514..73970f8 100644 --- a/core/src/main/java/brooklyn/entity/trait/StartableMethods.java +++ b/core/src/main/java/brooklyn/entity/trait/StartableMethods.java @@ -22,13 +22,13 @@ import java.util.Collection; import java.util.Collections; 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.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.effector.Effectors; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/event/basic/AttributeMap.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/AttributeMap.java b/core/src/main/java/brooklyn/event/basic/AttributeMap.java index da933c7..5ee5174 100644 --- a/core/src/main/java/brooklyn/event/basic/AttributeMap.java +++ b/core/src/main/java/brooklyn/event/basic/AttributeMap.java @@ -24,11 +24,11 @@ import java.io.Serializable; import java.util.Collection; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynLogging; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractEntity; import brooklyn.event.AttributeSensor; import brooklyn.util.flags.TypeCoercions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 57e0d40..b2f5ed3 100644 --- a/core/src/main/java/brooklyn/event/basic/AttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/AttributeSensorAndConfigKey.java @@ -18,6 +18,8 @@ */ package brooklyn.event.basic; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,11 +27,9 @@ import org.slf4j.LoggerFactory; import com.google.common.reflect.TypeToken; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.EntityLocal; import brooklyn.event.Sensor; import brooklyn.event.feed.ConfigToAttributes; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 4ab2aae..b922dc7 100644 --- a/core/src/main/java/brooklyn/event/basic/BasicAttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/BasicAttributeSensorAndConfigKey.java @@ -18,12 +18,12 @@ */ package brooklyn.event.basic; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.ManagementContext; import com.google.common.reflect.TypeToken; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.event.Sensor; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/event/basic/BasicSensor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/BasicSensor.java b/core/src/main/java/brooklyn/event/basic/BasicSensor.java index da93c69..b50d604 100644 --- a/core/src/main/java/brooklyn/event/basic/BasicSensor.java +++ b/core/src/main/java/brooklyn/event/basic/BasicSensor.java @@ -22,7 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.util.guava.TypeTokens; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/event/basic/BasicSensorEvent.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/BasicSensorEvent.java b/core/src/main/java/brooklyn/event/basic/BasicSensorEvent.java index b571eb7..65a7585 100644 --- a/core/src/main/java/brooklyn/event/basic/BasicSensorEvent.java +++ b/core/src/main/java/brooklyn/event/basic/BasicSensorEvent.java @@ -20,10 +20,10 @@ package brooklyn.event.basic; import java.util.ConcurrentModificationException; +import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 0498f23..5cd0ef9 100644 --- a/core/src/main/java/brooklyn/event/basic/DependentConfiguration.java +++ b/core/src/main/java/brooklyn/event/basic/DependentConfiguration.java @@ -34,6 +34,8 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.management.ExecutionContext; import org.apache.brooklyn.management.SubscriptionHandle; import org.apache.brooklyn.management.Task; @@ -43,12 +45,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.Lifecycle; import brooklyn.event.AttributeSensor; import brooklyn.event.SensorEvent; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 538b82c..83e99cf 100644 --- a/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java @@ -21,12 +21,12 @@ package brooklyn.event.basic; import java.util.Collection; import java.util.Iterator; +import org.apache.brooklyn.api.entity.Entity; 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.BrooklynConfigKeys; import brooklyn.event.Sensor; import brooklyn.internal.BrooklynInitialization; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 6e5c561..cd0ce99 100644 --- a/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java @@ -18,12 +18,12 @@ */ package brooklyn.event.basic; +import org.apache.brooklyn.api.entity.Entity; 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.internal.ManagementContextInternal; import brooklyn.util.text.TemplateProcessor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/event/feed/AbstractFeed.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/AbstractFeed.java b/core/src/main/java/brooklyn/event/feed/AbstractFeed.java index bc8df5f..a3ffb09 100644 --- a/core/src/main/java/brooklyn/event/feed/AbstractFeed.java +++ b/core/src/main/java/brooklyn/event/feed/AbstractFeed.java @@ -22,17 +22,17 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collection; +import org.apache.brooklyn.api.entity.Feed; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.mementos.FeedMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Feed; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.rebind.BasicFeedRebindSupport; -import brooklyn.entity.rebind.RebindSupport; import brooklyn.internal.BrooklynFeatureEnablement; import brooklyn.policy.basic.AbstractEntityAdjunct; import brooklyn.util.javalang.JavaClassNames; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/event/feed/AttributePollHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/AttributePollHandler.java b/core/src/main/java/brooklyn/event/feed/AttributePollHandler.java index 1bf39af..b9f1ca0 100644 --- a/core/src/main/java/brooklyn/event/feed/AttributePollHandler.java +++ b/core/src/main/java/brooklyn/event/feed/AttributePollHandler.java @@ -20,6 +20,7 @@ package brooklyn.event.feed; import static com.google.common.base.Preconditions.checkNotNull; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +29,6 @@ import com.google.common.base.Objects; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.Lifecycle.Transition; import brooklyn.event.AttributeSensor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 4b4db43..f3cce81 100644 --- a/core/src/main/java/brooklyn/event/feed/ConfigToAttributes.java +++ b/core/src/main/java/brooklyn/event/feed/ConfigToAttributes.java @@ -18,9 +18,9 @@ */ package brooklyn.event.feed; +import org.apache.brooklyn.api.entity.basic.EntityLocal; 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; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 5d966b7..96ce376 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.api.entity.basic.EntityLocal; import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +31,6 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; 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/a76dac4f/core/src/main/java/brooklyn/event/feed/function/FunctionFeed.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/function/FunctionFeed.java b/core/src/main/java/brooklyn/event/feed/function/FunctionFeed.java index 9f96f24..4da5ef8 100644 --- a/core/src/main/java/brooklyn/event/feed/function/FunctionFeed.java +++ b/core/src/main/java/brooklyn/event/feed/function/FunctionFeed.java @@ -25,12 +25,12 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.EntityLocal; import brooklyn.event.feed.AbstractFeed; import brooklyn.event.feed.AttributePollHandler; import brooklyn.event.feed.DelegatingPollHandler; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/event/feed/http/HttpFeed.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/http/HttpFeed.java b/core/src/main/java/brooklyn/event/feed/http/HttpFeed.java index 5131a4b..fed0dd0 100644 --- a/core/src/main/java/brooklyn/event/feed/http/HttpFeed.java +++ b/core/src/main/java/brooklyn/event/feed/http/HttpFeed.java @@ -28,6 +28,7 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.http.auth.Credentials; import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.HttpClient; @@ -37,7 +38,6 @@ import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.event.feed.AbstractFeed; import brooklyn.event.feed.AttributePollHandler; import brooklyn.event.feed.DelegatingPollHandler; @@ -94,7 +94,7 @@ import com.google.common.reflect.TypeToken; * <p> * * This also supports giving a Supplier for the URL - * (e.g. {@link Entities#attributeSupplier(brooklyn.entity.Entity, brooklyn.event.AttributeSensor)}) + * (e.g. {@link Entities#attributeSupplier(org.apache.brooklyn.api.entity.Entity, brooklyn.event.AttributeSensor)}) * from a sensor. Note however that if a Supplier-based sensor is *https*, * https-specific initialization may not occur if the URL is not available at start time, * and it may report errors if that sensor is not available. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 495338d..25883c8 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.api.entity.basic.EntityLocal; import org.apache.brooklyn.management.ExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +35,6 @@ import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.event.feed.AbstractFeed; import brooklyn.event.feed.AttributePollHandler; import brooklyn.event.feed.DelegatingPollHandler; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/event/feed/ssh/SshFeed.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/ssh/SshFeed.java b/core/src/main/java/brooklyn/event/feed/ssh/SshFeed.java index 6931089..f7975d9 100644 --- a/core/src/main/java/brooklyn/event/feed/ssh/SshFeed.java +++ b/core/src/main/java/brooklyn/event/feed/ssh/SshFeed.java @@ -28,13 +28,13 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.EntityLocal; import brooklyn.event.feed.AbstractFeed; import brooklyn.event.feed.AttributePollHandler; import brooklyn.event.feed.DelegatingPollHandler; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 4026fad..c646b9f 100644 --- a/core/src/main/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeed.java +++ b/core/src/main/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeed.java @@ -34,15 +34,15 @@ import java.util.regex.Pattern; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.management.ExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.effector.EffectorTasks; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/location/access/BrooklynAccessUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/access/BrooklynAccessUtils.java b/core/src/main/java/brooklyn/location/access/BrooklynAccessUtils.java index 2e9108d..9bf0f9b 100644 --- a/core/src/main/java/brooklyn/location/access/BrooklynAccessUtils.java +++ b/core/src/main/java/brooklyn/location/access/BrooklynAccessUtils.java @@ -20,11 +20,11 @@ package brooklyn.location.access; import java.util.Collection; +import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.event.basic.BasicConfigKey; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/location/access/PortForwardManagerAuthority.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/access/PortForwardManagerAuthority.java b/core/src/main/java/brooklyn/location/access/PortForwardManagerAuthority.java index a5f16f7..796328d 100644 --- a/core/src/main/java/brooklyn/location/access/PortForwardManagerAuthority.java +++ b/core/src/main/java/brooklyn/location/access/PortForwardManagerAuthority.java @@ -19,7 +19,8 @@ package brooklyn.location.access; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.entity.basic.EntityInternal; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/location/access/PortForwardManagerClient.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/access/PortForwardManagerClient.java b/core/src/main/java/brooklyn/location/access/PortForwardManagerClient.java index e9638fc..2c899d7 100644 --- a/core/src/main/java/brooklyn/location/access/PortForwardManagerClient.java +++ b/core/src/main/java/brooklyn/location/access/PortForwardManagerClient.java @@ -21,9 +21,10 @@ package brooklyn.location.access; import java.util.Collection; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.config.ConfigKey; import brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.entity.Entity; import brooklyn.event.AttributeSensor; import brooklyn.location.Location; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/location/access/PortForwardManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/access/PortForwardManagerImpl.java b/core/src/main/java/brooklyn/location/access/PortForwardManagerImpl.java index 5e87653..75de91f 100644 --- a/core/src/main/java/brooklyn/location/access/PortForwardManagerImpl.java +++ b/core/src/main/java/brooklyn/location/access/PortForwardManagerImpl.java @@ -29,13 +29,13 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.api.entity.rebind.RebindContext; +import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.mementos.LocationMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.rebind.BasicLocationRebindSupport; -import brooklyn.entity.rebind.RebindContext; -import brooklyn.entity.rebind.RebindSupport; import brooklyn.location.Location; import brooklyn.location.basic.AbstractLocation; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 e738880..cac5f5b 100644 --- a/core/src/main/java/brooklyn/location/basic/AbstractLocation.java +++ b/core/src/main/java/brooklyn/location/basic/AbstractLocation.java @@ -29,6 +29,8 @@ import java.util.Map; import java.util.Set; 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.mementos.LocationMemento; import org.slf4j.Logger; @@ -40,8 +42,6 @@ import brooklyn.config.ConfigKey; import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.rebind.BasicLocationRebindSupport; -import brooklyn.entity.rebind.RebindSupport; -import brooklyn.entity.trait.Configurable; import brooklyn.event.basic.BasicConfigKey; import brooklyn.internal.BrooklynFeatureEnablement; import brooklyn.internal.storage.BrooklynStorage; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 e99893d..02c9332 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.api.entity.rebind.RebindSupport; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.mementos.LocationMemento; @@ -27,7 +28,6 @@ import brooklyn.basic.BrooklynObjectInternal; import brooklyn.config.ConfigInheritance; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.rebind.RebindSupport; import brooklyn.location.Location; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 06de156..580b3b3 100644 --- a/core/src/main/java/brooklyn/location/basic/Locations.java +++ b/core/src/main/java/brooklyn/location/basic/Locations.java @@ -24,12 +24,12 @@ import java.util.Collections; 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.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; import brooklyn.location.Location; import brooklyn.location.LocationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/location/basic/Machines.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/Machines.java b/core/src/main/java/brooklyn/location/basic/Machines.java index 38e99d9..8c6115a 100644 --- a/core/src/main/java/brooklyn/location/basic/Machines.java +++ b/core/src/main/java/brooklyn/location/basic/Machines.java @@ -23,12 +23,12 @@ import java.util.Collection; import java.util.Iterator; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.collect.Iterables; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.location.Location; import brooklyn.location.MachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/location/cloud/names/AbstractCloudMachineNamer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/cloud/names/AbstractCloudMachineNamer.java b/core/src/main/java/brooklyn/location/cloud/names/AbstractCloudMachineNamer.java index 8e4cd41..d165fe1 100644 --- a/core/src/main/java/brooklyn/location/cloud/names/AbstractCloudMachineNamer.java +++ b/core/src/main/java/brooklyn/location/cloud/names/AbstractCloudMachineNamer.java @@ -18,8 +18,9 @@ */ package brooklyn.location.cloud.names; -import brooklyn.entity.Entity; -import brooklyn.entity.trait.HasShortName; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.trait.HasShortName; + import brooklyn.location.cloud.CloudLocationConfig; import brooklyn.util.config.ConfigBag; import brooklyn.util.text.Identifiers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/location/cloud/names/BasicCloudMachineNamer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/cloud/names/BasicCloudMachineNamer.java b/core/src/main/java/brooklyn/location/cloud/names/BasicCloudMachineNamer.java index 626a7ea..0b014f2 100644 --- a/core/src/main/java/brooklyn/location/cloud/names/BasicCloudMachineNamer.java +++ b/core/src/main/java/brooklyn/location/cloud/names/BasicCloudMachineNamer.java @@ -18,8 +18,9 @@ */ package brooklyn.location.cloud.names; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.location.cloud.CloudLocationConfig; import brooklyn.util.config.ConfigBag; import brooklyn.util.text.Identifiers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/location/cloud/names/CloudMachineNamer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/cloud/names/CloudMachineNamer.java b/core/src/main/java/brooklyn/location/cloud/names/CloudMachineNamer.java index 022c1f4..23dd31b 100644 --- a/core/src/main/java/brooklyn/location/cloud/names/CloudMachineNamer.java +++ b/core/src/main/java/brooklyn/location/cloud/names/CloudMachineNamer.java @@ -18,7 +18,8 @@ */ package brooklyn.location.cloud.names; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.location.Location; import brooklyn.location.cloud.CloudLocationConfig; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/location/cloud/names/CustomMachineNamer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/cloud/names/CustomMachineNamer.java b/core/src/main/java/brooklyn/location/cloud/names/CustomMachineNamer.java index 9fde17e..e5dabe3 100644 --- a/core/src/main/java/brooklyn/location/cloud/names/CustomMachineNamer.java +++ b/core/src/main/java/brooklyn/location/cloud/names/CustomMachineNamer.java @@ -20,8 +20,9 @@ package brooklyn.location.cloud.names; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; import brooklyn.location.cloud.CloudLocationConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/location/dynamic/DynamicLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/dynamic/DynamicLocation.java b/core/src/main/java/brooklyn/location/dynamic/DynamicLocation.java index 8412c6a..d85d40d 100644 --- a/core/src/main/java/brooklyn/location/dynamic/DynamicLocation.java +++ b/core/src/main/java/brooklyn/location/dynamic/DynamicLocation.java @@ -18,10 +18,11 @@ */ package brooklyn.location.dynamic; +import org.apache.brooklyn.api.entity.Entity; + import com.google.common.annotations.Beta; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.location.Location; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/location/dynamic/LocationOwner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/dynamic/LocationOwner.java b/core/src/main/java/brooklyn/location/dynamic/LocationOwner.java index f511569..11f81bc 100644 --- a/core/src/main/java/brooklyn/location/dynamic/LocationOwner.java +++ b/core/src/main/java/brooklyn/location/dynamic/LocationOwner.java @@ -20,8 +20,9 @@ package brooklyn.location.dynamic; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java b/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java index 137f873..43ee4ad 100644 --- a/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java +++ b/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java @@ -23,10 +23,10 @@ import java.net.InetAddress; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.location.AddressableLocation; import brooklyn.location.Location; import brooklyn.location.basic.AbstractLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 c41f513..3f9c409 100644 --- a/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java +++ b/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java @@ -18,6 +18,7 @@ */ 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; @@ -26,7 +27,6 @@ import org.slf4j.LoggerFactory; import com.google.common.annotations.Beta; -import brooklyn.entity.Entity; import brooklyn.management.entitlement.Entitlements.EntitlementClassesHandler; import brooklyn.management.entitlement.Entitlements.EntityAndItem; import brooklyn.management.entitlement.Entitlements.StringAndArgument; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 559eeaa..ffb6d79 100644 --- a/core/src/main/java/brooklyn/management/entitlement/Entitlements.java +++ b/core/src/main/java/brooklyn/management/entitlement/Entitlements.java @@ -23,6 +23,7 @@ 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; @@ -42,7 +43,6 @@ import com.google.common.reflect.TypeToken; import brooklyn.config.BrooklynProperties; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 b55569e..98ab862 100644 --- a/core/src/main/java/brooklyn/management/ha/BasicMasterChooser.java +++ b/core/src/main/java/brooklyn/management/ha/BasicMasterChooser.java @@ -22,13 +22,13 @@ import java.util.ArrayList; 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.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.trait.Identifiable; import brooklyn.util.collections.MutableList; import brooklyn.util.text.NaturalOrderComparator; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 3379b92..8ebbc76 100644 --- a/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java +++ b/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java @@ -29,6 +29,9 @@ import java.util.concurrent.Callable; 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; @@ -46,12 +49,9 @@ import brooklyn.catalog.internal.BasicBrooklynCatalog; import brooklyn.catalog.internal.CatalogDto; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.ConfigKey; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.rebind.RebindManager; import brooklyn.entity.rebind.RebindManagerImpl; import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils; import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils.CreateBackupMode; @@ -102,7 +102,7 @@ import com.google.common.collect.Iterables; * Promotion to master involves: * <ol> * <li>notifying the other management-nodes that it is now master - * <li>calling {@link RebindManager#rebind(ClassLoader, brooklyn.entity.rebind.RebindExceptionHandler, ManagementNodeState)} to read all persisted entity state, and thus reconstitute the entities. + * <li>calling {@link RebindManager#rebind(ClassLoader, org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler, ManagementNodeState)} to read all persisted entity state, and thus reconstitute the entities. * </ol> * <p> * Future improvements in this area will include brooklyn-managing-brooklyn to decide + promote http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 164c02d..ed57b42 100644 --- a/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java +++ b/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java @@ -35,6 +35,11 @@ import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.basic.BrooklynObject; +import org.apache.brooklyn.api.entity.Effector; +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.catalog.BrooklynCatalog; import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.management.ExecutionContext; @@ -50,16 +55,11 @@ import brooklyn.catalog.internal.CatalogInitialization; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.config.BrooklynProperties; import brooklyn.config.StringConfigMap; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.drivers.BasicEntityDriverManager; -import brooklyn.entity.drivers.EntityDriverManager; import brooklyn.entity.drivers.downloads.BasicDownloadsManager; -import brooklyn.entity.drivers.downloads.DownloadResolverManager; -import brooklyn.entity.rebind.RebindManager; import brooklyn.entity.rebind.RebindManagerImpl; import brooklyn.internal.storage.BrooklynStorage; import brooklyn.internal.storage.DataGrid; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 db360b1..441c2dd 100644 --- a/core/src/main/java/brooklyn/management/internal/AbstractSubscriptionManager.java +++ b/core/src/main/java/brooklyn/management/internal/AbstractSubscriptionManager.java @@ -23,13 +23,13 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collections; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.management.SubscriptionHandle; import org.apache.brooklyn.management.SubscriptionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 60eaf18..c0098f7 100644 --- a/core/src/main/java/brooklyn/management/internal/BasicSubscriptionContext.java +++ b/core/src/main/java/brooklyn/management/internal/BasicSubscriptionContext.java @@ -26,14 +26,14 @@ import java.util.Collections; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; 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; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 55407d0..2a4de29 100644 --- a/core/src/main/java/brooklyn/management/internal/BrooklynGarbageCollector.java +++ b/core/src/main/java/brooklyn/management/internal/BrooklynGarbageCollector.java @@ -35,6 +35,7 @@ import java.util.concurrent.ThreadFactory; 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.slf4j.Logger; @@ -42,7 +43,6 @@ import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynProperties; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.BrooklynTaskTags.WrappedEntity; import brooklyn.entity.basic.BrooklynTaskTags.WrappedStream; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 4f78a95..6562f0a 100644 --- a/core/src/main/java/brooklyn/management/internal/EffectorUtils.java +++ b/core/src/main/java/brooklyn/management/internal/EffectorUtils.java @@ -29,13 +29,13 @@ import java.util.Map; import java.util.NoSuchElementException; 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.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.ParameterType; import brooklyn.entity.basic.BasicParameterType; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.EntityInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java b/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java index d72d0c7..96d0882 100644 --- a/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java +++ b/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java @@ -18,12 +18,12 @@ */ package brooklyn.management.internal; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Feed; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; -import brooklyn.entity.Feed; import brooklyn.event.AttributeSensor; public interface EntityChangeListener { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 3dc76b1..d04eebb 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.api.entity.Application; +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.management.ExecutionContext; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.SubscriptionContext; @@ -33,10 +37,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Application; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.Feed; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 4b0e257..d19f701 100644 --- a/core/src/main/java/brooklyn/management/internal/EntityManagementUtils.java +++ b/core/src/main/java/brooklyn/management/internal/EntityManagementUtils.java @@ -30,6 +30,10 @@ import java.util.concurrent.Callable; import javax.annotation.Nullable; +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; @@ -39,15 +43,11 @@ import org.slf4j.LoggerFactory; import brooklyn.camp.brooklyn.api.AssemblyTemplateSpecInstantiator; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.ConfigKey; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityFunctions; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.effector.Effectors; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.management.classloading.JavaBrooklynClassLoadingContext; import brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 de64668..56ca88c 100644 --- a/core/src/main/java/brooklyn/management/internal/EntityManagerInternal.java +++ b/core/src/main/java/brooklyn/management/internal/EntityManagerInternal.java @@ -18,11 +18,10 @@ */ 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 brooklyn.entity.Application; -import brooklyn.entity.Entity; - public interface EntityManagerInternal extends EntityManager, BrooklynObjectManagerInternal<Entity> { /** gets all entities currently known to the application, including entities that are not yet managed */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 8a8918f..3a83d90 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalAccessManager.java +++ b/core/src/main/java/brooklyn/management/internal/LocalAccessManager.java @@ -20,9 +20,9 @@ package brooklyn.management.internal; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.AccessController; -import brooklyn.entity.Entity; import brooklyn.location.Location; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 e0f14ab..fb21f20 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java +++ b/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java @@ -32,6 +32,11 @@ import java.util.concurrent.ConcurrentMap; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Application; +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.policy.Enricher; @@ -42,9 +47,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynLogging; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; @@ -53,8 +55,6 @@ import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.proxying.BasicEntityTypeRegistry; import brooklyn.entity.proxying.EntityProxy; import brooklyn.entity.proxying.EntityProxyImpl; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.proxying.EntityTypeRegistry; import brooklyn.entity.proxying.InternalEntityFactory; import brooklyn.entity.proxying.InternalPolicyFactory; import brooklyn.entity.trait.Startable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 ac98c13..1b007fb 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalManagementContext.java +++ b/core/src/main/java/brooklyn/management/internal/LocalManagementContext.java @@ -31,6 +31,9 @@ import java.util.WeakHashMap; import java.util.concurrent.Callable; 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; @@ -43,9 +46,6 @@ import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynProperties.Factory.Builder; -import brooklyn.entity.Application; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; import brooklyn.entity.drivers.downloads.BasicDownloadsManager; import brooklyn.entity.effector.Effectors; import brooklyn.entity.proxying.InternalEntityFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 c6c096b..74cb31e 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalSubscriptionManager.java +++ b/core/src/main/java/brooklyn/management/internal/LocalSubscriptionManager.java @@ -33,13 +33,13 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.ExecutionManager; import org.apache.brooklyn.management.SubscriptionHandle; import org.apache.brooklyn.management.SubscriptionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 4619cb7..4095118 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalUsageManager.java +++ b/core/src/main/java/brooklyn/management/internal/LocalUsageManager.java @@ -31,12 +31,12 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; 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.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.Lifecycle; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java b/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java index 1a3516c..baf4fa4 100644 --- a/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java +++ b/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java @@ -24,13 +24,13 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.Task; import brooklyn.catalog.internal.CatalogInitialization; import brooklyn.config.BrooklynProperties; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.proxying.InternalEntityFactory; import brooklyn.entity.proxying.InternalLocationFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java b/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java index 1e0caa7..83f98dd 100644 --- a/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java +++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java @@ -22,17 +22,16 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.proxying.EntityTypeRegistry; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.policy.PolicySpec; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.proxying.EntityTypeRegistry; - import com.google.common.base.Predicate; public class NonDeploymentEntityManager implements EntityManagerInternal { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java b/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java index 32401b8..6d050ca 100644 --- a/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java +++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java @@ -32,6 +32,15 @@ import java.util.concurrent.TimeoutException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.basic.BrooklynObject; +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.api.entity.drivers.EntityDriverManager; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager; +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.catalog.BrooklynCatalog; import org.apache.brooklyn.management.AccessController; import org.apache.brooklyn.management.EntityManager; @@ -52,19 +61,10 @@ import org.apache.brooklyn.mementos.BrooklynMementoRawData; import brooklyn.catalog.internal.CatalogInitialization; import brooklyn.config.BrooklynProperties; import brooklyn.config.StringConfigMap; -import brooklyn.entity.Application; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractEntity; -import brooklyn.entity.drivers.EntityDriverManager; -import brooklyn.entity.drivers.downloads.DownloadResolverManager; import brooklyn.entity.proxying.InternalEntityFactory; import brooklyn.entity.proxying.InternalLocationFactory; import brooklyn.entity.proxying.InternalPolicyFactory; -import brooklyn.entity.rebind.ChangeListener; -import brooklyn.entity.rebind.PersistenceExceptionHandler; -import brooklyn.entity.rebind.RebindExceptionHandler; -import brooklyn.entity.rebind.RebindManager; import brooklyn.internal.storage.BrooklynStorage; import brooklyn.location.Location; import brooklyn.location.LocationRegistry; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/management/internal/NonDeploymentUsageManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/NonDeploymentUsageManager.java b/core/src/main/java/brooklyn/management/internal/NonDeploymentUsageManager.java index 366a25c..c8508a1 100644 --- a/core/src/main/java/brooklyn/management/internal/NonDeploymentUsageManager.java +++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentUsageManager.java @@ -20,7 +20,8 @@ package brooklyn.management.internal; import java.util.Set; -import brooklyn.entity.Application; +import org.apache.brooklyn.api.entity.Application; + import brooklyn.entity.basic.Lifecycle; import brooklyn.location.Location; import brooklyn.management.usage.ApplicationUsage; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/management/internal/QueueingSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/QueueingSubscriptionManager.java b/core/src/main/java/brooklyn/management/internal/QueueingSubscriptionManager.java index 64dd1dc..13f7a97 100644 --- a/core/src/main/java/brooklyn/management/internal/QueueingSubscriptionManager.java +++ b/core/src/main/java/brooklyn/management/internal/QueueingSubscriptionManager.java @@ -25,9 +25,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.SubscriptionHandle; -import brooklyn.entity.Entity; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/management/internal/Subscription.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/Subscription.java b/core/src/main/java/brooklyn/management/internal/Subscription.java index 07b0ae4..9ab1dcc 100644 --- a/core/src/main/java/brooklyn/management/internal/Subscription.java +++ b/core/src/main/java/brooklyn/management/internal/Subscription.java @@ -20,9 +20,9 @@ package brooklyn.management.internal; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.SubscriptionHandle; -import brooklyn.entity.Entity; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener;
