http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/DataEntity.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/DataEntity.java b/core/src/main/java/brooklyn/entity/basic/DataEntity.java index 8f0bd50..fe2269b 100644 --- a/core/src/main/java/brooklyn/entity/basic/DataEntity.java +++ b/core/src/main/java/brooklyn/entity/basic/DataEntity.java @@ -20,9 +20,10 @@ package brooklyn.entity.basic; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.trait.Startable; import brooklyn.event.AttributeSensor; import brooklyn.util.flags.SetFromFlag;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/DelegateEntity.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/DelegateEntity.java b/core/src/main/java/brooklyn/entity/basic/DelegateEntity.java index d41d1df..81b558b 100644 --- a/core/src/main/java/brooklyn/entity/basic/DelegateEntity.java +++ b/core/src/main/java/brooklyn/entity/basic/DelegateEntity.java @@ -20,10 +20,11 @@ package brooklyn.entity.basic; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.render.RendererHints; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.AttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/DelegateEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/DelegateEntityImpl.java b/core/src/main/java/brooklyn/entity/basic/DelegateEntityImpl.java index 719b7c0..c7d5f98 100644 --- a/core/src/main/java/brooklyn/entity/basic/DelegateEntityImpl.java +++ b/core/src/main/java/brooklyn/entity/basic/DelegateEntityImpl.java @@ -18,8 +18,9 @@ */ package brooklyn.entity.basic; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.enricher.Enrichers; -import brooklyn.entity.Entity; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java b/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java index 0b9613d..7baaa95 100644 --- a/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java +++ b/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java @@ -18,13 +18,14 @@ */ package brooklyn.entity.basic; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import com.google.common.base.Predicate; import com.google.common.reflect.TypeToken; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.annotation.Effector; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.trait.Startable; import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java b/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java index 259178c..37ebcc6 100644 --- a/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java +++ b/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java @@ -23,13 +23,13 @@ import groovy.lang.Closure; import java.util.Collection; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynLogging; import brooklyn.config.BrooklynLogging.LoggingLevel; -import brooklyn.entity.Entity; 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/entity/basic/Entities.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/Entities.java b/core/src/main/java/brooklyn/entity/basic/Entities.java index a828bc1..c87fecb 100644 --- a/core/src/main/java/brooklyn/entity/basic/Entities.java +++ b/core/src/main/java/brooklyn/entity/basic/Entities.java @@ -39,6 +39,14 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +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.Group; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.drivers.EntityDriver; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ExecutionContext; import org.apache.brooklyn.management.LocationManager; import org.apache.brooklyn.management.ManagementContext; @@ -54,15 +62,8 @@ import brooklyn.basic.BrooklynObjectInternal; import brooklyn.config.BrooklynProperties; import brooklyn.config.ConfigKey; import brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.entity.Application; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; -import brooklyn.entity.drivers.EntityDriver; -import brooklyn.entity.drivers.downloads.DownloadResolver; import brooklyn.entity.effector.Effectors; import brooklyn.entity.proxying.EntityProxyImpl; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.entity.trait.StartableMethods; import brooklyn.event.AttributeSensor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/EntityAdjuncts.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityAdjuncts.java b/core/src/main/java/brooklyn/entity/basic/EntityAdjuncts.java index 35e7ee6..f105741 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityAdjuncts.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityAdjuncts.java @@ -21,10 +21,10 @@ package brooklyn.entity.basic; import java.util.Iterator; import java.util.List; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EntityAdjunct; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers; import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceState; import brooklyn.entity.basic.ServiceStateLogic.ServiceNotUpLogic; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/EntityAndAttribute.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityAndAttribute.java b/core/src/main/java/brooklyn/entity/basic/EntityAndAttribute.java index a7d5a5a..5c1b0af 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityAndAttribute.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityAndAttribute.java @@ -19,7 +19,10 @@ package brooklyn.entity.basic; import static com.google.common.base.Preconditions.checkNotNull; -import brooklyn.entity.Entity; + +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; + import brooklyn.event.AttributeSensor; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/EntityDynamicType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityDynamicType.java b/core/src/main/java/brooklyn/entity/basic/EntityDynamicType.java index c4a455b..3c33c16 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityDynamicType.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityDynamicType.java @@ -26,14 +26,14 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.EntityType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynDynamicType; import brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.EntityType; import brooklyn.entity.effector.EffectorAndBody; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.EffectorTasks.EffectorBodyTaskFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/EntityFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityFactory.java b/core/src/main/java/brooklyn/entity/basic/EntityFactory.java index 8e93d12..2982a06 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityFactory.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityFactory.java @@ -20,7 +20,7 @@ package brooklyn.entity.basic; import java.util.Map; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; /** * A Factory for creating entities. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/EntityFactoryForLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityFactoryForLocation.java b/core/src/main/java/brooklyn/entity/basic/EntityFactoryForLocation.java index 8ae1626..f1644aa 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityFactoryForLocation.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityFactoryForLocation.java @@ -18,7 +18,8 @@ */ package brooklyn.entity.basic; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.location.Location; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java b/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java index 26d5f3b..cfa5286 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java @@ -23,12 +23,13 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collection; import java.util.Map; +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.trait.Identifiable; import org.apache.brooklyn.management.ManagementContext; import brooklyn.config.ConfigKey; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; -import brooklyn.entity.trait.Identifiable; import brooklyn.event.AttributeSensor; import brooklyn.location.Location; import brooklyn.util.flags.TypeCoercions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/EntityInitializers.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityInitializers.java b/core/src/main/java/brooklyn/entity/basic/EntityInitializers.java index 40d0c44..7b57c4a 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityInitializers.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityInitializers.java @@ -20,7 +20,8 @@ package brooklyn.entity.basic; import java.util.List; -import brooklyn.entity.proxying.EntityInitializer; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntityInitializer; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/EntityInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java index d951bc7..277cfd9 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java @@ -21,6 +21,11 @@ package brooklyn.entity.basic; import java.util.Collection; import java.util.Map; +import org.apache.brooklyn.api.entity.Effector; +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.api.entity.rebind.Rebindable; import org.apache.brooklyn.management.ExecutionContext; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.SubscriptionContext; @@ -28,10 +33,6 @@ import org.apache.brooklyn.mementos.EntityMemento; import brooklyn.basic.BrooklynObjectInternal; import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; -import brooklyn.entity.Feed; -import brooklyn.entity.rebind.RebindSupport; -import brooklyn.entity.rebind.Rebindable; import brooklyn.event.AttributeSensor; import brooklyn.location.Location; import brooklyn.management.internal.EntityManagementSupport; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java b/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java index 96ecb7a..fa4f264 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java @@ -23,10 +23,11 @@ import java.util.regex.Pattern; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; + import brooklyn.config.ConfigKey; import brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.event.AttributeSensor; import brooklyn.location.Location; import brooklyn.util.collections.CollectionFunctionals; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/EntitySuppliers.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntitySuppliers.java b/core/src/main/java/brooklyn/entity/basic/EntitySuppliers.java index 4ec779b..c0f30b9 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntitySuppliers.java +++ b/core/src/main/java/brooklyn/entity/basic/EntitySuppliers.java @@ -18,7 +18,8 @@ */ package brooklyn.entity.basic; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.location.basic.Machines; import brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/EntityTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityTasks.java b/core/src/main/java/brooklyn/entity/basic/EntityTasks.java index 3b8cf15..5c13868 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityTasks.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityTasks.java @@ -18,9 +18,9 @@ */ package brooklyn.entity.basic; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.Task; -import brooklyn.entity.Entity; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.DependentConfiguration; import brooklyn.util.collections.CollectionFunctionals; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java b/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java index dfda0a7..bc96cdf 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java @@ -26,6 +26,12 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.apache.brooklyn.api.basic.BrooklynObject.TagSupport; +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.EntityType; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.management.ExecutionContext; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.mementos.EntityMemento; @@ -34,14 +40,8 @@ import org.apache.brooklyn.policy.Policy; import brooklyn.config.ConfigKey; import brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.entity.Application; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.EntityType; -import brooklyn.entity.Group; import brooklyn.entity.basic.EntityInternal.FeedSupport; import brooklyn.entity.proxying.EntityProxyImpl; -import brooklyn.entity.rebind.RebindSupport; import brooklyn.event.AttributeSensor; import brooklyn.location.Location; import brooklyn.management.internal.EntityManagementSupport; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/EntityTypeSnapshot.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityTypeSnapshot.java b/core/src/main/java/brooklyn/entity/basic/EntityTypeSnapshot.java index 2395d66..e935b65 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityTypeSnapshot.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityTypeSnapshot.java @@ -24,11 +24,12 @@ 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.EntityType; +import org.apache.brooklyn.api.entity.ParameterType; + import brooklyn.basic.BrooklynTypeSnapshot; import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; -import brooklyn.entity.EntityType; -import brooklyn.entity.ParameterType; import brooklyn.event.Sensor; import brooklyn.util.guava.Maybe; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/ExplicitEffector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/ExplicitEffector.java b/core/src/main/java/brooklyn/entity/basic/ExplicitEffector.java index c8035d0..59620c4 100644 --- a/core/src/main/java/brooklyn/entity/basic/ExplicitEffector.java +++ b/core/src/main/java/brooklyn/entity/basic/ExplicitEffector.java @@ -23,8 +23,8 @@ import groovy.lang.Closure; import java.util.List; import java.util.Map; -import brooklyn.entity.Entity; -import brooklyn.entity.ParameterType; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.ParameterType; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/Lifecycle.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/Lifecycle.java b/core/src/main/java/brooklyn/entity/basic/Lifecycle.java index d4449a1..9918bde 100644 --- a/core/src/main/java/brooklyn/entity/basic/Lifecycle.java +++ b/core/src/main/java/brooklyn/entity/basic/Lifecycle.java @@ -33,7 +33,7 @@ import com.google.common.base.Objects; import com.google.common.base.Preconditions; /** - * An enumeration representing the status of an {@link brooklyn.entity.Entity}. + * An enumeration representing the status of an {@link org.apache.brooklyn.api.entity.Entity}. */ public enum Lifecycle { /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/MethodEffector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/MethodEffector.java b/core/src/main/java/brooklyn/entity/basic/MethodEffector.java index 6c54c43..4d07344 100644 --- a/core/src/main/java/brooklyn/entity/basic/MethodEffector.java +++ b/core/src/main/java/brooklyn/entity/basic/MethodEffector.java @@ -24,13 +24,13 @@ import java.util.Arrays; 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.ParameterType; import org.codehaus.groovy.runtime.MethodClosure; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.ParameterType; import brooklyn.entity.annotation.EffectorParam; import brooklyn.management.internal.EffectorUtils; import brooklyn.util.GroovyJavaMethods; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/ServiceStateLogic.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/ServiceStateLogic.java b/core/src/main/java/brooklyn/entity/basic/ServiceStateLogic.java index 8224873..041f046 100644 --- a/core/src/main/java/brooklyn/entity/basic/ServiceStateLogic.java +++ b/core/src/main/java/brooklyn/entity/basic/ServiceStateLogic.java @@ -26,6 +26,10 @@ import java.util.Set; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.EnricherSpec.ExtensibleEnricherSpec; @@ -40,9 +44,6 @@ import brooklyn.enricher.Enrichers; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.enricher.basic.AbstractMultipleSensorAggregator; import brooklyn.enricher.basic.UpdatingMap; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.Lifecycle.Transition; import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/basic/StartableApplication.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/StartableApplication.java b/core/src/main/java/brooklyn/entity/basic/StartableApplication.java index 8f6a5d4..abf8ff4 100644 --- a/core/src/main/java/brooklyn/entity/basic/StartableApplication.java +++ b/core/src/main/java/brooklyn/entity/basic/StartableApplication.java @@ -18,7 +18,8 @@ */ package brooklyn.entity.basic; -import brooklyn.entity.Application; +import org.apache.brooklyn.api.entity.Application; + import brooklyn.entity.trait.Startable; public interface StartableApplication extends Application, Startable { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/drivers/BasicEntityDriverManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/BasicEntityDriverManager.java b/core/src/main/java/brooklyn/entity/drivers/BasicEntityDriverManager.java index 268bee5..3a9ed09 100644 --- a/core/src/main/java/brooklyn/entity/drivers/BasicEntityDriverManager.java +++ b/core/src/main/java/brooklyn/entity/drivers/BasicEntityDriverManager.java @@ -18,6 +18,10 @@ */ package brooklyn.entity.drivers; +import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity; +import org.apache.brooklyn.api.entity.drivers.EntityDriver; +import org.apache.brooklyn.api.entity.drivers.EntityDriverManager; + import com.google.common.annotations.Beta; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactory.java b/core/src/main/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactory.java index cbdd233..3c3836a 100644 --- a/core/src/main/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactory.java +++ b/core/src/main/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactory.java @@ -23,6 +23,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity; +import org.apache.brooklyn.api.entity.drivers.EntityDriver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/drivers/RegistryEntityDriverFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/RegistryEntityDriverFactory.java b/core/src/main/java/brooklyn/entity/drivers/RegistryEntityDriverFactory.java index b8a9bec..84265dc 100644 --- a/core/src/main/java/brooklyn/entity/drivers/RegistryEntityDriverFactory.java +++ b/core/src/main/java/brooklyn/entity/drivers/RegistryEntityDriverFactory.java @@ -25,7 +25,11 @@ import java.lang.reflect.InvocationTargetException; import java.util.LinkedHashMap; import java.util.Map; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity; +import org.apache.brooklyn.api.entity.drivers.EntityDriver; +import org.apache.brooklyn.api.entity.drivers.EntityDriverManager; + import brooklyn.location.Location; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadRequirement.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadRequirement.java b/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadRequirement.java index f77cde2..07d0825 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadRequirement.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadRequirement.java @@ -22,8 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import brooklyn.entity.drivers.EntityDriver; -import brooklyn.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; +import org.apache.brooklyn.api.entity.drivers.EntityDriver; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; + import brooklyn.util.collections.MutableMap; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadResolver.java b/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadResolver.java index a4f859b..412df5d 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadResolver.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadResolver.java @@ -22,6 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver; + import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadTargets.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadTargets.java b/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadTargets.java index 2b1c545..abcd49e 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadTargets.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadTargets.java @@ -22,7 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; -import brooklyn.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; + import brooklyn.util.collections.MutableList; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadsManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadsManager.java b/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadsManager.java index 9839c21..a112f5e 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadsManager.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadsManager.java @@ -24,8 +24,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.api.entity.drivers.EntityDriver; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager; + import brooklyn.config.StringConfigMap; -import brooklyn.entity.drivers.EntityDriver; import brooklyn.util.text.Strings; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromCloudsoftRepo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromCloudsoftRepo.java b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromCloudsoftRepo.java index 7fa0009..c94432e 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromCloudsoftRepo.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromCloudsoftRepo.java @@ -20,13 +20,13 @@ package brooklyn.entity.drivers.downloads; import java.util.Map; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.config.StringConfigMap; -import brooklyn.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; -import brooklyn.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; import brooklyn.event.basic.BasicConfigKey; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepo.java b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepo.java index 31643fd..198949d 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepo.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepo.java @@ -20,13 +20,13 @@ package brooklyn.entity.drivers.downloads; import java.util.Map; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.config.StringConfigMap; -import brooklyn.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; -import brooklyn.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; import brooklyn.event.basic.BasicConfigKey; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromProperties.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromProperties.java b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromProperties.java index 55696a4..e5d9364 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromProperties.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromProperties.java @@ -23,15 +23,15 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.drivers.EntityDriver; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.StringConfigMap; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; -import brooklyn.entity.drivers.EntityDriver; -import brooklyn.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; -import brooklyn.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; import brooklyn.util.text.Strings; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromUrlAttribute.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromUrlAttribute.java b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromUrlAttribute.java index 65a5d8d..6053c02 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromUrlAttribute.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromUrlAttribute.java @@ -20,9 +20,10 @@ package brooklyn.entity.drivers.downloads; import java.util.Map; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; + import brooklyn.entity.basic.Attributes; -import brooklyn.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; -import brooklyn.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; import com.google.common.base.Function; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadSubstituters.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadSubstituters.java b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadSubstituters.java index 7ff520a..76eba6d 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadSubstituters.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadSubstituters.java @@ -26,14 +26,14 @@ import java.io.OutputStreamWriter; import java.io.Writer; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.drivers.EntityDriver; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynConfigKeys; -import brooklyn.entity.drivers.EntityDriver; -import brooklyn.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; -import brooklyn.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/drivers/downloads/FilenameProducers.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/FilenameProducers.java b/core/src/main/java/brooklyn/entity/drivers/downloads/FilenameProducers.java index 6c07abf..87902b3 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/FilenameProducers.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/FilenameProducers.java @@ -22,8 +22,9 @@ import java.util.List; import javax.annotation.Nullable; -import brooklyn.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; -import brooklyn.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; +import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; + import brooklyn.util.text.Strings; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java b/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java index 5ce5bde..b7ce04f 100644 --- a/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java +++ b/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java @@ -21,12 +21,12 @@ package brooklyn.entity.effector; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.effector.Effectors.EffectorBuilder; import brooklyn.management.internal.EntityManagementUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/effector/AddEffector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/effector/AddEffector.java b/core/src/main/java/brooklyn/entity/effector/AddEffector.java index 12ec10c..c0d986d 100644 --- a/core/src/main/java/brooklyn/entity/effector/AddEffector.java +++ b/core/src/main/java/brooklyn/entity/effector/AddEffector.java @@ -21,14 +21,15 @@ package brooklyn.entity.effector; import java.util.Collections; import java.util.Map; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.ParameterType; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntityInitializer; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; -import brooklyn.entity.ParameterType; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.effector.Effectors.EffectorBuilder; -import brooklyn.entity.proxying.EntityInitializer; import brooklyn.event.basic.MapConfigKey; import brooklyn.util.config.ConfigBag; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/effector/AddSensor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/effector/AddSensor.java b/core/src/main/java/brooklyn/entity/effector/AddSensor.java index 318d78a..b7861ea 100644 --- a/core/src/main/java/brooklyn/entity/effector/AddSensor.java +++ b/core/src/main/java/brooklyn/entity/effector/AddSensor.java @@ -20,11 +20,12 @@ package brooklyn.entity.effector; import java.util.Map; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntityInitializer; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; -import brooklyn.entity.proxying.EntityInitializer; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/effector/EffectorAndBody.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/effector/EffectorAndBody.java b/core/src/main/java/brooklyn/entity/effector/EffectorAndBody.java index 67fe033..24299c8 100644 --- a/core/src/main/java/brooklyn/entity/effector/EffectorAndBody.java +++ b/core/src/main/java/brooklyn/entity/effector/EffectorAndBody.java @@ -20,8 +20,9 @@ package brooklyn.entity.effector; import java.util.List; -import brooklyn.entity.Effector; -import brooklyn.entity.ParameterType; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.ParameterType; + import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/effector/EffectorBase.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/effector/EffectorBase.java b/core/src/main/java/brooklyn/entity/effector/EffectorBase.java index 6f8e795..0d7ff71 100644 --- a/core/src/main/java/brooklyn/entity/effector/EffectorBase.java +++ b/core/src/main/java/brooklyn/entity/effector/EffectorBase.java @@ -21,11 +21,11 @@ package brooklyn.entity.effector; import java.util.ArrayList; import java.util.List; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.ParameterType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Effector; -import brooklyn.entity.ParameterType; import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory; import com.google.common.base.Joiner; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java b/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java index 8888c81..aa1110b 100644 --- a/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java +++ b/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java @@ -22,15 +22,15 @@ import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicReference; +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.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.ParameterType; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; import brooklyn.location.basic.Machines; @@ -70,7 +70,7 @@ public class EffectorTasks { } @Override - public Task<T> newTask(final Entity entity, final brooklyn.entity.Effector<T> effector, final ConfigBag parameters) { + public Task<T> newTask(final Entity entity, final org.apache.brooklyn.api.entity.Effector<T> effector, final ConfigBag parameters) { final AtomicReference<DynamicSequentialTask<T>> dst = new AtomicReference<DynamicSequentialTask<T>>(); dst.set(new DynamicSequentialTask<T>( @@ -119,7 +119,7 @@ public class EffectorTasks { } @Override - public Task<T> newTask(final Entity entity, final brooklyn.entity.Effector<T> effector, final ConfigBag parameters) { + public Task<T> newTask(final Entity entity, final org.apache.brooklyn.api.entity.Effector<T> effector, final ConfigBag parameters) { if (effectorTaskFactory instanceof EffectorBodyTaskFactory) return effectorTaskFactory.newTask(entity, effector, parameters).asTask(); // if we're in an effector context for this effector already, then also pass through http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/effector/EffectorWithBody.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/effector/EffectorWithBody.java b/core/src/main/java/brooklyn/entity/effector/EffectorWithBody.java index 017bcd6..4bd8a11 100644 --- a/core/src/main/java/brooklyn/entity/effector/EffectorWithBody.java +++ b/core/src/main/java/brooklyn/entity/effector/EffectorWithBody.java @@ -18,7 +18,8 @@ */ package brooklyn.entity.effector; -import brooklyn.entity.Effector; +import org.apache.brooklyn.api.entity.Effector; + import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/effector/Effectors.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/effector/Effectors.java b/core/src/main/java/brooklyn/entity/effector/Effectors.java index aedd6cf..bfa4d30 100644 --- a/core/src/main/java/brooklyn/entity/effector/Effectors.java +++ b/core/src/main/java/brooklyn/entity/effector/Effectors.java @@ -26,19 +26,19 @@ import java.util.Map; import javax.annotation.Nullable; +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.api.entity.basic.EntityLocal; import org.apache.brooklyn.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; -import brooklyn.entity.ParameterType; import brooklyn.entity.basic.BasicParameterType; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.effector.EffectorTasks.EffectorBodyTaskFactory; import brooklyn.entity.effector.EffectorTasks.EffectorMarkingTaskFactory; import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java b/core/src/main/java/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java index 6f71a8c..0bc61a2 100644 --- a/core/src/main/java/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java +++ b/core/src/main/java/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java @@ -23,17 +23,17 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynLogging; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.DynamicGroup; -import brooklyn.entity.basic.EntityLocal; 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/entity/group/Cluster.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/Cluster.java b/core/src/main/java/brooklyn/entity/group/Cluster.java index 6b0daac..b618c66 100644 --- a/core/src/main/java/brooklyn/entity/group/Cluster.java +++ b/core/src/main/java/brooklyn/entity/group/Cluster.java @@ -18,7 +18,8 @@ */ package brooklyn.entity.group; -import brooklyn.entity.Group; +import org.apache.brooklyn.api.entity.Group; + import brooklyn.entity.trait.Resizable; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.BasicConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/group/DynamicCluster.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/DynamicCluster.java b/core/src/main/java/brooklyn/entity/group/DynamicCluster.java index 8309528..f1a11ae 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicCluster.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicCluster.java @@ -23,9 +23,12 @@ import java.util.List; 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.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.AbstractGroup; @@ -37,8 +40,6 @@ import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy; import brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.trait.MemberReplaceable; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java b/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java index d582944..f9d0f1a 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java @@ -31,25 +31,25 @@ import java.util.Set; import javax.annotation.Nullable; +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.Task; import org.apache.brooklyn.policy.Policy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.render.RendererHints; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractGroupImpl; import brooklyn.entity.basic.DelegateEntity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityFactory; import brooklyn.entity.basic.EntityFactoryForLocation; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.QuorumCheck.QuorumChecks; import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.basic.ServiceStateLogic.ServiceProblemsLogic; import brooklyn.entity.effector.Effectors; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.entity.trait.StartableMethods; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/group/DynamicFabric.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/DynamicFabric.java b/core/src/main/java/brooklyn/entity/group/DynamicFabric.java index 51735ec..fe33e18 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicFabric.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicFabric.java @@ -18,14 +18,15 @@ */ package brooklyn.entity.group; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractGroup; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityFactory; import brooklyn.entity.basic.Lifecycle; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.trait.Startable; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.MapConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java b/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java index 8c13ce2..2f63dd9 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java @@ -27,22 +27,22 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; +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.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.enricher.Enrichers; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractGroupImpl; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityFactory; import brooklyn.entity.basic.EntityFactoryForLocation; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.effector.Effectors; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Changeable; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/group/DynamicMultiGroup.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/DynamicMultiGroup.java b/core/src/main/java/brooklyn/entity/group/DynamicMultiGroup.java index 44a3378..3655974 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicMultiGroup.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicMultiGroup.java @@ -20,14 +20,15 @@ package brooklyn.entity.group; import java.util.Map; +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.ImplementedBy; + import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.DynamicGroup; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/group/DynamicMultiGroupImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/DynamicMultiGroupImpl.java b/core/src/main/java/brooklyn/entity/group/DynamicMultiGroupImpl.java index 50b9a63..17d69d7 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicMultiGroupImpl.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicMultiGroupImpl.java @@ -25,12 +25,13 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; + import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.DynamicGroupImpl; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.function.FunctionPollConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabric.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabric.java b/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabric.java index baf0358..8096bfc 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabric.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabric.java @@ -18,10 +18,11 @@ */ package brooklyn.entity.group; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.MethodEffector; -import brooklyn.entity.proxying.ImplementedBy; @ImplementedBy(DynamicRegionsFabricImpl.class) public interface DynamicRegionsFabric extends DynamicFabric { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabricImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabricImpl.java b/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabricImpl.java index 9b20ac9..aac843f 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabricImpl.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabricImpl.java @@ -21,11 +21,11 @@ package brooklyn.entity.group; import java.util.Arrays; import java.util.Collection; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.trait.Startable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/group/QuarantineGroup.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/QuarantineGroup.java b/core/src/main/java/brooklyn/entity/group/QuarantineGroup.java index 6431574..e7c6d11 100644 --- a/core/src/main/java/brooklyn/entity/group/QuarantineGroup.java +++ b/core/src/main/java/brooklyn/entity/group/QuarantineGroup.java @@ -18,12 +18,13 @@ */ package brooklyn.entity.group; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.AbstractGroup; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.proxying.ImplementedBy; @ImplementedBy(QuarantineGroupImpl.class) public interface QuarantineGroup extends AbstractGroup { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/group/QuarantineGroupImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/QuarantineGroupImpl.java b/core/src/main/java/brooklyn/entity/group/QuarantineGroupImpl.java index aece11d..71b4b16 100644 --- a/core/src/main/java/brooklyn/entity/group/QuarantineGroupImpl.java +++ b/core/src/main/java/brooklyn/entity/group/QuarantineGroupImpl.java @@ -21,11 +21,11 @@ package brooklyn.entity.group; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.AbstractGroupImpl; import brooklyn.entity.basic.Entities; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/group/Tier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/Tier.java b/core/src/main/java/brooklyn/entity/group/Tier.java index 5bee3cf..25d23f9 100644 --- a/core/src/main/java/brooklyn/entity/group/Tier.java +++ b/core/src/main/java/brooklyn/entity/group/Tier.java @@ -18,7 +18,7 @@ */ package brooklyn.entity.group; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; /** * Intended to represent a "layer" of an application; this could be within a single location http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/group/zoneaware/AbstractZoneFailureDetector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/zoneaware/AbstractZoneFailureDetector.java b/core/src/main/java/brooklyn/entity/group/zoneaware/AbstractZoneFailureDetector.java index ed3ac45..d2082ca 100644 --- a/core/src/main/java/brooklyn/entity/group/zoneaware/AbstractZoneFailureDetector.java +++ b/core/src/main/java/brooklyn/entity/group/zoneaware/AbstractZoneFailureDetector.java @@ -23,7 +23,8 @@ import java.util.List; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.entity.group.DynamicCluster.ZoneFailureDetector; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategy.java b/core/src/main/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategy.java index 08e106a..2393f47 100644 --- a/core/src/main/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategy.java +++ b/core/src/main/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategy.java @@ -24,10 +24,10 @@ import java.util.Comparator; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.entity.group.DynamicCluster.NodePlacementStrategy; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/group/zoneaware/CombiningZoneFailureDetector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/zoneaware/CombiningZoneFailureDetector.java b/core/src/main/java/brooklyn/entity/group/zoneaware/CombiningZoneFailureDetector.java index 51f6365..f318106 100644 --- a/core/src/main/java/brooklyn/entity/group/zoneaware/CombiningZoneFailureDetector.java +++ b/core/src/main/java/brooklyn/entity/group/zoneaware/CombiningZoneFailureDetector.java @@ -20,7 +20,8 @@ package brooklyn.entity.group.zoneaware; import java.util.List; -import brooklyn.entity.Entity; +import org.apache.brooklyn.api.entity.Entity; + import brooklyn.entity.group.DynamicCluster.ZoneFailureDetector; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/proxying/BasicEntityTypeRegistry.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/proxying/BasicEntityTypeRegistry.java b/core/src/main/java/brooklyn/entity/proxying/BasicEntityTypeRegistry.java index 09f0cfb..8946bb6 100644 --- a/core/src/main/java/brooklyn/entity/proxying/BasicEntityTypeRegistry.java +++ b/core/src/main/java/brooklyn/entity/proxying/BasicEntityTypeRegistry.java @@ -26,10 +26,12 @@ import java.util.Deque; import java.util.LinkedList; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntityTypeRegistry; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Entity; import brooklyn.util.exceptions.Exceptions; import com.google.common.collect.BiMap; @@ -104,7 +106,7 @@ public class BasicEntityTypeRegistry implements EntityTypeRegistry { } private <T extends Entity> Class<? extends T> getFromAnnotation(Class<T> type) { - ImplementedBy annotation = type.getAnnotation(brooklyn.entity.proxying.ImplementedBy.class); + ImplementedBy annotation = type.getAnnotation(org.apache.brooklyn.api.entity.proxying.ImplementedBy.class); if (annotation == null) return null; Class<? extends Entity> value = annotation.value(); @@ -126,7 +128,7 @@ public class BasicEntityTypeRegistry implements EntityTypeRegistry { visited.add(contender); if (contender.isInterface()) { - ImplementedBy annotation = contender.getAnnotation(brooklyn.entity.proxying.ImplementedBy.class); + ImplementedBy annotation = contender.getAnnotation(org.apache.brooklyn.api.entity.proxying.ImplementedBy.class); Class<? extends Entity> value = (annotation == null) ? null : annotation.value(); if (implClazz.equals(value)) return (Class<? super T>) contender; } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/proxying/EntityProxyImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/proxying/EntityProxyImpl.java b/core/src/main/java/brooklyn/entity/proxying/EntityProxyImpl.java index 9bb7de9..88f89aa 100644 --- a/core/src/main/java/brooklyn/entity/proxying/EntityProxyImpl.java +++ b/core/src/main/java/brooklyn/entity/proxying/EntityProxyImpl.java @@ -28,16 +28,16 @@ import java.util.Map; import java.util.Set; import java.util.WeakHashMap; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.EntityTransientCopyInternal; import brooklyn.entity.basic.EntityTransientCopyInternal.SpecialEntityTransientCopyInternal; import brooklyn.entity.effector.EffectorWithBody; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 9855d39..5afbec3 100644 --- a/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java +++ b/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java @@ -26,6 +26,12 @@ import java.util.Collection; 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.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntityInitializer; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.proxying.EntityTypeRegistry; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.Policy; @@ -34,14 +40,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.collections.MutableMap; @@ -156,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(brooklyn.entity.Application, org.apache.brooklyn.management.ManagementContext)} + * or {@link Entities#startManagement(org.apache.brooklyn.api.entity.Application, org.apache.brooklyn.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/a76dac4f/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 02c0d45..a2549b6 100644 --- a/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java +++ b/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java @@ -20,6 +20,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.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; @@ -28,7 +29,6 @@ import org.apache.brooklyn.policy.PolicySpec; import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; -import brooklyn.entity.Feed; import brooklyn.entity.basic.AbstractEntity; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.policy.basic.AbstractPolicy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java index 5eda7e6..b03e22b 100644 --- a/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java @@ -18,6 +18,8 @@ */ package brooklyn.entity.rebind; +import org.apache.brooklyn.api.entity.rebind.RebindContext; +import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.mementos.Memento; import org.apache.brooklyn.policy.EntityAdjunct; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 723ff22..ead37a3 100644 --- a/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java @@ -26,6 +26,9 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicInteger; 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.mementos.BrooklynMementoPersister; import org.apache.brooklyn.mementos.BrooklynMementoRawData; @@ -35,7 +38,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynObjectInternal; -import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.PersistenceActivityMetrics; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java index 856c758..d37e404 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.rebind; +import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.mementos.CatalogItemMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/rebind/BasicEnricherRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicEnricherRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicEnricherRebindSupport.java index 11a2529..b5abe2f 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicEnricherRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicEnricherRebindSupport.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.rebind; +import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.mementos.EnricherMemento; import brooklyn.enricher.basic.AbstractEnricher; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java index 7c2f044..779050a 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java @@ -23,18 +23,20 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collections; import java.util.Map; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.Entity; +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.mementos.EntityMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; -import brooklyn.entity.Effector; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.AbstractGroupImpl; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.rebind.dto.MementosGenerators; import brooklyn.event.AttributeSensor; import brooklyn.event.feed.AbstractFeed; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/rebind/BasicFeedRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicFeedRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicFeedRebindSupport.java index ab6ba9d..763a917 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicFeedRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicFeedRebindSupport.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.rebind; +import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.mementos.FeedMemento; import brooklyn.event.feed.AbstractFeed; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java index 7bc6282..13c6d83 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.Map; import java.util.NoSuchElementException; +import org.apache.brooklyn.api.entity.rebind.RebindContext; 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/a76dac4f/core/src/main/java/brooklyn/entity/rebind/BasicPolicyRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicPolicyRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicPolicyRebindSupport.java index a0a092f..ca9237e 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicPolicyRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicPolicyRebindSupport.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.rebind; +import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.mementos.PolicyMemento; import brooklyn.policy.basic.AbstractPolicy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java b/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java index 7796c27..9a62c52 100644 --- a/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java +++ b/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java @@ -24,6 +24,9 @@ import java.util.Map; import brooklyn.basic.BrooklynObjectInternal; import org.apache.brooklyn.api.basic.BrooklynObject; +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.catalog.CatalogItem; import org.apache.brooklyn.mementos.BrooklynMementoPersister; import org.apache.brooklyn.mementos.CatalogItemMemento; @@ -35,7 +38,6 @@ import org.apache.brooklyn.mementos.PolicyMemento; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; -import brooklyn.entity.Entity; import brooklyn.location.Location; import brooklyn.location.basic.LocationInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 ca4034d..dbe28d6 100644 --- a/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java @@ -22,13 +22,14 @@ import java.util.Set; import java.util.concurrent.Semaphore; 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.mementos.BrooklynMementoPersister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynLogging; -import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.rebind.persister.PersistenceActivityMetrics; import brooklyn.management.internal.BrooklynObjectManagementMode; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/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 a8bac53..6b79823 100644 --- a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java +++ b/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java @@ -33,6 +33,11 @@ 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.ChangeListener; +import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.management.ExecutionContext; import org.apache.brooklyn.management.Task; @@ -40,8 +45,6 @@ import org.apache.brooklyn.mementos.BrooklynMementoPersister; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; -import brooklyn.entity.Entity; -import brooklyn.entity.Feed; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java b/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java index 198097d..51e78f7 100644 --- a/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java @@ -22,6 +22,8 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; 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.mementos.Memento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/main/java/brooklyn/entity/rebind/PersisterDeltaImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/PersisterDeltaImpl.java b/core/src/main/java/brooklyn/entity/rebind/PersisterDeltaImpl.java index 12dcf66..9e3371b 100644 --- a/core/src/main/java/brooklyn/entity/rebind/PersisterDeltaImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/PersisterDeltaImpl.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Set; +import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.mementos.CatalogItemMemento; import org.apache.brooklyn.mementos.EnricherMemento; import org.apache.brooklyn.mementos.EntityMemento;
