http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 63b49b5..56e73d1 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java @@ -38,12 +38,12 @@ import org.apache.brooklyn.api.mementos.EntityMemento; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.core.management.internal.EntityManagementSupport; +import org.apache.brooklyn.core.util.config.ConfigBag; import brooklyn.config.ConfigKey; import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.entity.basic.EntityInternal.FeedSupport; import brooklyn.entity.proxying.EntityProxyImpl; -import brooklyn.util.config.ConfigBag; import brooklyn.util.guava.Maybe; import com.google.common.annotations.Beta;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 9bb0177..97e3ada 100644 --- a/core/src/main/java/brooklyn/entity/basic/Lifecycle.java +++ b/core/src/main/java/brooklyn/entity/basic/Lifecycle.java @@ -24,7 +24,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import brooklyn.config.render.RendererHints; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.text.StringFunctions; import com.google.common.base.CaseFormat; @@ -33,6 +32,7 @@ import com.google.common.base.Objects; import com.google.common.base.Preconditions; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.util.flags.TypeCoercions; /** * An enumeration representing the status of an {@link org.apache.brooklyn.api.entity.Entity}. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 121f70f..f5978b7 100644 --- a/core/src/main/java/brooklyn/entity/basic/MethodEffector.java +++ b/core/src/main/java/brooklyn/entity/basic/MethodEffector.java @@ -28,6 +28,7 @@ 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.core.management.internal.EffectorUtils; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.codehaus.groovy.runtime.MethodClosure; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +36,6 @@ import org.slf4j.LoggerFactory; import brooklyn.entity.annotation.EffectorParam; import brooklyn.util.GroovyJavaMethods; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.TypeCoercions; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/core/src/main/java/brooklyn/entity/basic/Sanitizer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/Sanitizer.java b/core/src/main/java/brooklyn/entity/basic/Sanitizer.java index 88ca756..7e81bb2 100644 --- a/core/src/main/java/brooklyn/entity/basic/Sanitizer.java +++ b/core/src/main/java/brooklyn/entity/basic/Sanitizer.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import brooklyn.util.config.ConfigBag; +import org.apache.brooklyn.core.util.config.ConfigBag; import com.google.api.client.util.Lists; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 2a551b4..bf4bd43 100644 --- a/core/src/main/java/brooklyn/entity/basic/ServiceStateLogic.java +++ b/core/src/main/java/brooklyn/entity/basic/ServiceStateLogic.java @@ -37,6 +37,7 @@ import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.EnricherSpec.ExtensibleEnricherSpec; +import org.apache.brooklyn.core.util.task.ValueResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,7 +58,6 @@ import brooklyn.util.collections.QuorumCheck; import brooklyn.util.guava.Functionals; import brooklyn.util.guava.Maybe; import brooklyn.util.repeat.Repeater; -import brooklyn.util.task.ValueResolver; import brooklyn.util.text.Strings; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 eef3cf9..0119dd1 100644 --- a/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java +++ b/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java @@ -25,13 +25,13 @@ import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.core.management.internal.EntityManagementUtils; import org.apache.brooklyn.core.management.internal.EntityManagementUtils.CreationResult; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.effector.Effectors.EffectorBuilder; -import brooklyn.util.config.ConfigBag; import com.google.common.annotations.Beta; import com.google.gson.Gson; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 c0d986d..0db7c40 100644 --- a/core/src/main/java/brooklyn/entity/effector/AddEffector.java +++ b/core/src/main/java/brooklyn/entity/effector/AddEffector.java @@ -25,13 +25,13 @@ 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 org.apache.brooklyn.core.util.config.ConfigBag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.effector.Effectors.EffectorBuilder; import brooklyn.event.basic.MapConfigKey; -import brooklyn.util.config.ConfigBag; import brooklyn.util.text.Strings; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 8e29baa..2aa95a6 100644 --- a/core/src/main/java/brooklyn/entity/effector/AddSensor.java +++ b/core/src/main/java/brooklyn/entity/effector/AddSensor.java @@ -23,12 +23,12 @@ import java.util.Map; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntityInitializer; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.config.ConfigBag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; import brooklyn.event.basic.Sensors; -import brooklyn.util.config.ConfigBag; import brooklyn.util.guava.Maybe; import brooklyn.util.javalang.Boxing; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/core/src/main/java/brooklyn/entity/effector/EffectorBody.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/effector/EffectorBody.java b/core/src/main/java/brooklyn/entity/effector/EffectorBody.java index 98c8153..1a60cbe 100644 --- a/core/src/main/java/brooklyn/entity/effector/EffectorBody.java +++ b/core/src/main/java/brooklyn/entity/effector/EffectorBody.java @@ -21,14 +21,14 @@ package brooklyn.entity.effector; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.api.management.TaskFactory; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.core.util.task.DynamicSequentialTask; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.Tasks; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.EntityInternal; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.flags.TypeCoercions; -import brooklyn.util.task.DynamicSequentialTask; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 6094686..f9a702e 100644 --- a/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java +++ b/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java @@ -28,6 +28,11 @@ import org.apache.brooklyn.api.entity.ParameterType; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.core.management.internal.EffectorUtils; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.task.DynamicSequentialTask; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.TaskBuilder; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,12 +44,7 @@ import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.basic.WinRmMachineLocation; -import brooklyn.util.config.ConfigBag; import brooklyn.util.javalang.Reflections; -import brooklyn.util.task.DynamicSequentialTask; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.TaskBuilder; -import brooklyn.util.task.Tasks; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 ff595e7..c0b6306 100644 --- a/core/src/main/java/brooklyn/entity/effector/Effectors.java +++ b/core/src/main/java/brooklyn/entity/effector/Effectors.java @@ -31,6 +31,8 @@ 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.api.management.TaskAdaptable; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,8 +45,6 @@ import brooklyn.entity.effector.EffectorTasks.EffectorBodyTaskFactory; import brooklyn.entity.effector.EffectorTasks.EffectorMarkingTaskFactory; import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.task.Tasks; import brooklyn.util.text.Strings; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 b618c66..ac066a7 100644 --- a/core/src/main/java/brooklyn/entity/group/Cluster.java +++ b/core/src/main/java/brooklyn/entity/group/Cluster.java @@ -19,11 +19,11 @@ package brooklyn.entity.group; import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.entity.trait.Resizable; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.flags.SetFromFlag; /** * Intended to represent a group of homogeneous entities in a single location. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 ab14f49..435308e 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicCluster.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicCluster.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; @@ -46,7 +47,6 @@ import brooklyn.entity.trait.MemberReplaceable; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.event.basic.Sensors; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.time.Duration; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 5025026..1cdbd8e 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java @@ -38,6 +38,10 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.TaskTags; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,13 +66,9 @@ import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.exceptions.ReferenceWithError; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.guava.Maybe; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.javalang.Reflections; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.TaskTags; -import brooklyn.util.task.Tasks; import brooklyn.util.text.StringPredicates; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 f7decf9..dc23e7c 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicFabric.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicFabric.java @@ -21,6 +21,7 @@ package brooklyn.entity.group; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractGroup; @@ -31,7 +32,6 @@ import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.MapConfigKey; import brooklyn.event.basic.Sensors; -import brooklyn.util.flags.SetFromFlag; import com.google.common.collect.ImmutableMap; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 3a49634..d5a8c9a 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicMultiGroup.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicMultiGroup.java @@ -25,13 +25,13 @@ import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.DynamicGroup; import brooklyn.event.basic.Sensors; -import brooklyn.util.flags.SetFromFlag; import com.google.common.annotations.Beta; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 9f8c14e..4a6b75e 100644 --- a/core/src/main/java/brooklyn/entity/group/QuarantineGroupImpl.java +++ b/core/src/main/java/brooklyn/entity/group/QuarantineGroupImpl.java @@ -23,6 +23,8 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,8 +34,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.effector.Effectors; import brooklyn.entity.trait.Startable; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; import brooklyn.util.text.Strings; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 647ad76..b121179 100644 --- a/core/src/main/java/brooklyn/entity/proxying/EntityProxyImpl.java +++ b/core/src/main/java/brooklyn/entity/proxying/EntityProxyImpl.java @@ -36,6 +36,9 @@ import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.core.management.internal.EffectorUtils; import org.apache.brooklyn.core.management.internal.EntityManagerInternal; import org.apache.brooklyn.core.management.internal.ManagementTransitionMode; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.TaskTags; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,9 +48,6 @@ import brooklyn.entity.basic.EntityTransientCopyInternal; import brooklyn.entity.basic.EntityTransientCopyInternal.SpecialEntityTransientCopyInternal; import brooklyn.entity.effector.EffectorWithBody; import brooklyn.entity.rebind.RebindManagerImpl.RebindTracker; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.TaskTags; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 c2a4bfd..1c1a920 100644 --- a/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java +++ b/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java @@ -37,6 +37,8 @@ import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.util.flags.FlagUtils; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,9 +52,7 @@ import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.FlagUtils; import brooklyn.util.javalang.AggregateClassLoader; -import brooklyn.util.task.Tasks; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java b/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java index 10338b8..464d2a4 100644 --- a/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java +++ b/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java @@ -27,15 +27,15 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.internal.LocalLocationManager; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.FlagUtils; import brooklyn.config.ConfigKey; import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.basic.LocationInternal; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.FlagUtils; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 aeb371c..7c53404 100644 --- a/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java +++ b/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java @@ -27,13 +27,13 @@ import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.util.config.ConfigBag; import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.basic.AbstractEntity; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 52e87a6..6ee5eb2 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java @@ -21,11 +21,11 @@ package brooklyn.entity.rebind; import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.mementos.CatalogItemMemento; import org.apache.brooklyn.core.catalog.internal.CatalogItemDtoAbstract; +import org.apache.brooklyn.core.util.flags.FlagUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.FlagUtils; public class BasicCatalogItemRebindSupport extends AbstractBrooklynObjectRebindSupport<CatalogItemMemento> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 d6b289f..e3e4598 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicEnricherRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicEnricherRebindSupport.java @@ -20,10 +20,10 @@ package brooklyn.entity.rebind; import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.mementos.EnricherMemento; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.FlagUtils; import brooklyn.enricher.basic.AbstractEnricher; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.flags.FlagUtils; public class BasicEnricherRebindSupport extends AbstractBrooklynObjectRebindSupport<EnricherMemento> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 5507e6b..f3358e2 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicFeedRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicFeedRebindSupport.java @@ -20,10 +20,10 @@ package brooklyn.entity.rebind; import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.mementos.FeedMemento; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.FlagUtils; import brooklyn.event.feed.AbstractFeed; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.flags.FlagUtils; public class BasicFeedRebindSupport extends AbstractBrooklynObjectRebindSupport<FeedMemento> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 edf8867..7f1f286 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java @@ -26,6 +26,8 @@ import java.util.NoSuchElementException; import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.mementos.LocationMemento; +import org.apache.brooklyn.core.util.flags.FlagUtils; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,8 +37,6 @@ import brooklyn.entity.rebind.dto.MementosGenerators; import org.apache.brooklyn.location.basic.AbstractLocation; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.FlagUtils; -import brooklyn.util.flags.TypeCoercions; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 9b22d65..4623225 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicPolicyRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicPolicyRebindSupport.java @@ -20,10 +20,10 @@ package brooklyn.entity.rebind; import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.mementos.PolicyMemento; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.FlagUtils; import brooklyn.policy.basic.AbstractPolicy; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.flags.FlagUtils; public class BasicPolicyRebindSupport extends AbstractBrooklynObjectRebindSupport<PolicyMemento> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 d204ecc..2c55e7f 100644 --- a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java +++ b/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java @@ -46,6 +46,8 @@ import org.apache.brooklyn.api.mementos.BrooklynMementoPersister; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement; +import org.apache.brooklyn.core.util.task.ScheduledTask; +import org.apache.brooklyn.core.util.task.Tasks; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.EntityInternal; @@ -56,8 +58,6 @@ import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.exceptions.RuntimeInterruptedException; import brooklyn.util.repeat.Repeater; -import brooklyn.util.task.ScheduledTask; -import brooklyn.util.task.Tasks; import brooklyn.util.time.CountdownTimer; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 1164fff..67d20ae 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java @@ -73,6 +73,7 @@ import org.apache.brooklyn.core.management.internal.EntityManagerInternal; import org.apache.brooklyn.core.management.internal.LocationManagerInternal; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.management.internal.ManagementTransitionMode; +import org.apache.brooklyn.core.util.flags.FlagUtils; import brooklyn.config.BrooklynLogging; import brooklyn.config.BrooklynLogging.LoggingLevel; @@ -95,7 +96,6 @@ import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.FlagUtils; import brooklyn.util.guava.Maybe; import brooklyn.util.javalang.Reflections; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 862c86b..f810a98 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java @@ -46,6 +46,9 @@ import org.apache.brooklyn.api.mementos.TreeNode; import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement; import org.apache.brooklyn.core.management.ha.HighAvailabilityManagerImpl; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.util.task.BasicExecutionContext; +import org.apache.brooklyn.core.util.task.ScheduledTask; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,9 +68,6 @@ import brooklyn.util.collections.QuorumCheck; import brooklyn.util.collections.QuorumCheck.QuorumChecks; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.exceptions.RuntimeInterruptedException; -import brooklyn.util.task.BasicExecutionContext; -import brooklyn.util.task.ScheduledTask; -import brooklyn.util.task.Tasks; import brooklyn.util.time.Duration; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/core/src/main/java/brooklyn/entity/rebind/dto/BasicLocationMemento.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/BasicLocationMemento.java b/core/src/main/java/brooklyn/entity/rebind/dto/BasicLocationMemento.java index a0578bb..6fbf66a 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BasicLocationMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BasicLocationMemento.java @@ -24,10 +24,10 @@ import java.util.Set; import org.apache.brooklyn.api.mementos.LocationMemento; import org.apache.brooklyn.api.mementos.TreeNode; +import org.apache.brooklyn.core.util.config.ConfigBag; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Sanitizer; -import brooklyn.util.config.ConfigBag; import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 dbe6e26..5c52788 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java @@ -50,6 +50,8 @@ import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.EntityAdjunct; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.core.catalog.internal.CatalogItemDo; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.FlagUtils; import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; @@ -64,8 +66,6 @@ import org.apache.brooklyn.location.basic.LocationInternal; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.flags.FlagUtils; import com.google.common.annotations.Beta; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 b5ca9c1..f146999 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java @@ -50,6 +50,7 @@ import org.apache.brooklyn.api.mementos.CatalogItemMemento; import org.apache.brooklyn.api.mementos.Memento; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.classloading.ClassLoaderFromBrooklynClassLoadingContext; +import org.apache.brooklyn.core.util.xstream.XmlUtil; import brooklyn.config.ConfigKey; import brooklyn.config.StringConfigMap; @@ -66,7 +67,6 @@ import brooklyn.util.exceptions.Exceptions; import brooklyn.util.text.Strings; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; -import brooklyn.util.xstream.XmlUtil; import com.google.common.annotations.Beta; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 68074e9..3db8106 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java @@ -45,6 +45,7 @@ import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.core.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore; import org.apache.brooklyn.core.management.internal.LocalLocationManager; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.util.ResourceUtils; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.BrooklynServerPaths; @@ -56,7 +57,6 @@ import brooklyn.entity.rebind.transformer.CompoundTransformerLoader; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.util.ResourceUtils; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.text.Strings; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java b/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java index c1df659..764d55f 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java @@ -36,6 +36,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.core.util.internal.ssh.process.ProcessTool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +45,6 @@ import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.exceptions.FatalConfigurationRuntimeException; -import brooklyn.util.internal.ssh.process.ProcessTool; import brooklyn.util.io.FileUtil; import brooklyn.util.os.Os; import brooklyn.util.os.Os.DeletionResult; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 99ee2e5..6ff75e5 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java @@ -47,6 +47,7 @@ import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.classloading.BrooklynClassLoadingContextSequential; import org.apache.brooklyn.core.management.classloading.ClassLoaderFromBrooklynClassLoadingContext; import org.apache.brooklyn.core.management.classloading.JavaBrooklynClassLoadingContext; +import org.apache.brooklyn.core.util.xstream.XmlSerializer; import brooklyn.entity.basic.BasicParameterType; import brooklyn.entity.effector.EffectorAndBody; @@ -63,7 +64,6 @@ import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.text.Strings; -import brooklyn.util.xstream.XmlSerializer; import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.converters.MarshallingContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 33d9422..030cd53 100644 --- a/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java +++ b/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java @@ -26,13 +26,13 @@ import java.util.Map; import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.text.TemplateProcessor; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.transformer.impl.XsltTransformer; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.text.Strings; -import brooklyn.util.text.TemplateProcessor; import com.google.common.annotations.Beta; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformerLoader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformerLoader.java b/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformerLoader.java index 8a2d4bb..b36328c 100644 --- a/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformerLoader.java +++ b/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformerLoader.java @@ -22,13 +22,13 @@ import java.util.Collection; import java.util.Map; import java.util.Map.Entry; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.text.TemplateProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.rebind.transformer.CompoundTransformer.Builder; -import brooklyn.util.ResourceUtils; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.TemplateProcessor; import brooklyn.util.yaml.Yamls; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 19c7f9d..dad2152 100644 --- a/core/src/main/java/brooklyn/entity/trait/Startable.java +++ b/core/src/main/java/brooklyn/entity/trait/Startable.java @@ -23,6 +23,8 @@ import java.util.Collection; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,8 +35,6 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.Effectors; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.task.Tasks; /** * This interface describes an {@link org.apache.brooklyn.api.entity.Entity} that can be started and stopped. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 6188d14..0e14058 100644 --- a/core/src/main/java/brooklyn/entity/trait/StartableMethods.java +++ b/core/src/main/java/brooklyn/entity/trait/StartableMethods.java @@ -26,6 +26,9 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.TaskAdaptable; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.TaskTags; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,10 +36,7 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.effector.Effectors; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.CompoundRuntimeException; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.TaskTags; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 aa8dcc1..281adfd 100644 --- a/core/src/main/java/brooklyn/event/basic/AttributeMap.java +++ b/core/src/main/java/brooklyn/event/basic/AttributeMap.java @@ -26,12 +26,12 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynLogging; import brooklyn.entity.basic.AbstractEntity; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.guava.Maybe; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 fda8063..f9cec48 100644 --- a/core/src/main/java/brooklyn/event/basic/AttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/AttributeSensorAndConfigKey.java @@ -22,6 +22,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +34,6 @@ import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.feed.ConfigToAttributes; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.TypeCoercions; /** * A {@link Sensor} describing an attribute that can be configured with inputs that are used to derive the final value. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java b/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java index 1e41aad..f3b9204 100644 --- a/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java @@ -28,6 +28,8 @@ import java.util.concurrent.ExecutionException; import javax.annotation.Nullable; import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.core.util.internal.ConfigKeySelfExtracting; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,8 +37,6 @@ import brooklyn.config.ConfigInheritance; import brooklyn.config.ConfigKey; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.TypeTokens; -import brooklyn.util.internal.ConfigKeySelfExtracting; -import brooklyn.util.task.Tasks; import com.google.common.annotations.Beta; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 44d8688..4f990cf 100644 --- a/core/src/main/java/brooklyn/event/basic/DependentConfiguration.java +++ b/core/src/main/java/brooklyn/event/basic/DependentConfiguration.java @@ -44,6 +44,14 @@ import org.apache.brooklyn.api.management.SubscriptionHandle; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.api.management.TaskFactory; +import org.apache.brooklyn.core.util.task.BasicExecutionContext; +import org.apache.brooklyn.core.util.task.BasicTask; +import org.apache.brooklyn.core.util.task.DeferredSupplier; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.ParallelTask; +import org.apache.brooklyn.core.util.task.TaskInternal; +import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.core.util.task.ValueResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,14 +71,6 @@ import brooklyn.util.exceptions.NotManagedException; import brooklyn.util.exceptions.RuntimeTimeoutException; import brooklyn.util.guava.Functionals; import brooklyn.util.guava.Maybe; -import brooklyn.util.task.BasicExecutionContext; -import brooklyn.util.task.BasicTask; -import brooklyn.util.task.DeferredSupplier; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.ParallelTask; -import brooklyn.util.task.TaskInternal; -import brooklyn.util.task.Tasks; -import brooklyn.util.task.ValueResolver; import brooklyn.util.text.Strings; import brooklyn.util.time.CountdownTimer; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 fd7100a..ffd8229 100644 --- a/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.api.location.PortSupplier; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.internal.BrooklynInitialization; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +38,6 @@ import brooklyn.entity.basic.BrooklynConfigKeys; import org.apache.brooklyn.location.basic.Locations; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.guava.Maybe; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 0a57b62..8537f49 100644 --- a/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java @@ -21,12 +21,12 @@ package brooklyn.event.basic; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.util.text.TemplateProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.EntityInternal; -import brooklyn.util.text.TemplateProcessor; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 fbfe65c..ff4ef6e 100644 --- a/core/src/main/java/brooklyn/event/feed/AttributePollHandler.java +++ b/core/src/main/java/brooklyn/event/feed/AttributePollHandler.java @@ -22,6 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,8 +34,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.Lifecycle.Transition; -import brooklyn.util.flags.TypeCoercions; -import brooklyn.util.task.Tasks; import brooklyn.util.time.Duration; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 1bd97cd..2f14f22 100644 --- a/core/src/main/java/brooklyn/event/feed/Poller.java +++ b/core/src/main/java/brooklyn/event/feed/Poller.java @@ -24,6 +24,9 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.task.DynamicSequentialTask; +import org.apache.brooklyn.core.util.task.ScheduledTask; +import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,9 +35,6 @@ import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.util.collections.MutableMap; -import brooklyn.util.task.DynamicSequentialTask; -import brooklyn.util.task.ScheduledTask; -import brooklyn.util.task.Tasks; import brooklyn.util.time.Duration; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 342e430..39f008a 100644 --- a/core/src/main/java/brooklyn/event/feed/http/HttpFeed.java +++ b/core/src/main/java/brooklyn/event/feed/http/HttpFeed.java @@ -29,6 +29,9 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.core.util.http.HttpTool; +import org.apache.brooklyn.core.util.http.HttpToolResponse; +import org.apache.brooklyn.core.util.http.HttpTool.HttpClientBuilder; import org.apache.http.auth.Credentials; import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.HttpClient; @@ -42,9 +45,6 @@ import brooklyn.event.feed.AbstractFeed; import brooklyn.event.feed.AttributePollHandler; import brooklyn.event.feed.DelegatingPollHandler; import brooklyn.event.feed.Poller; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpTool.HttpClientBuilder; -import brooklyn.util.http.HttpToolResponse; import brooklyn.util.time.Duration; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/core/src/main/java/brooklyn/event/feed/http/HttpPollConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/http/HttpPollConfig.java b/core/src/main/java/brooklyn/event/feed/http/HttpPollConfig.java index 923995f..b27fede 100644 --- a/core/src/main/java/brooklyn/event/feed/http/HttpPollConfig.java +++ b/core/src/main/java/brooklyn/event/feed/http/HttpPollConfig.java @@ -24,12 +24,12 @@ import java.util.Map; import javax.annotation.Nullable; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.http.HttpTool; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import brooklyn.event.feed.PollConfig; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpToolResponse; import brooklyn.util.time.Duration; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/core/src/main/java/brooklyn/event/feed/http/HttpPollValue.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/http/HttpPollValue.java b/core/src/main/java/brooklyn/event/feed/http/HttpPollValue.java index 81fe325..1df1f9a 100644 --- a/core/src/main/java/brooklyn/event/feed/http/HttpPollValue.java +++ b/core/src/main/java/brooklyn/event/feed/http/HttpPollValue.java @@ -21,7 +21,7 @@ package brooklyn.event.feed.http; import java.util.List; import java.util.Map; -import brooklyn.util.http.HttpToolResponse; +import org.apache.brooklyn.core.util.http.HttpToolResponse; /** @deprecated since 0.7.0, use {@link HttpToolResponse}. * the old {@link HttpPollValue} concrete class has been renamed {@link HttpToolResponse} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/core/src/main/java/brooklyn/event/feed/http/HttpPolls.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/http/HttpPolls.java b/core/src/main/java/brooklyn/event/feed/http/HttpPolls.java index 2e53618..94391ce 100644 --- a/core/src/main/java/brooklyn/event/feed/http/HttpPolls.java +++ b/core/src/main/java/brooklyn/event/feed/http/HttpPolls.java @@ -20,11 +20,10 @@ package brooklyn.event.feed.http; import java.net.URI; +import org.apache.brooklyn.core.util.http.HttpTool; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.http.impl.client.DefaultHttpClient; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpToolResponse; - import com.google.common.collect.ImmutableMap; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/core/src/main/java/brooklyn/event/feed/http/HttpValueFunctions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/http/HttpValueFunctions.java b/core/src/main/java/brooklyn/event/feed/http/HttpValueFunctions.java index 3e7e6b2..f6ab2b5 100644 --- a/core/src/main/java/brooklyn/event/feed/http/HttpValueFunctions.java +++ b/core/src/main/java/brooklyn/event/feed/http/HttpValueFunctions.java @@ -20,8 +20,9 @@ package brooklyn.event.feed.http; import java.util.List; +import org.apache.brooklyn.core.util.http.HttpToolResponse; + import brooklyn.util.guava.Functionals; -import brooklyn.util.http.HttpToolResponse; import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 7362666..5c82be7 100644 --- a/core/src/main/java/brooklyn/event/feed/shell/ShellFeed.java +++ b/core/src/main/java/brooklyn/event/feed/shell/ShellFeed.java @@ -29,6 +29,9 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.core.util.task.system.ProcessTaskFactory; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; +import org.apache.brooklyn.core.util.task.system.internal.SystemProcessTaskFactory.ConcreteSystemProcessTaskFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,9 +45,6 @@ import brooklyn.event.feed.Poller; import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.ssh.SshFeed; import brooklyn.event.feed.ssh.SshPollValue; -import brooklyn.util.task.system.ProcessTaskFactory; -import brooklyn.util.task.system.ProcessTaskWrapper; -import brooklyn.util.task.system.internal.SystemProcessTaskFactory.ConcreteSystemProcessTaskFactory; import com.google.common.base.Objects; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 200e2fb..46c751b 100644 --- a/core/src/main/java/brooklyn/event/feed/ssh/SshFeed.java +++ b/core/src/main/java/brooklyn/event/feed/ssh/SshFeed.java @@ -30,6 +30,8 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,11 +41,11 @@ import brooklyn.event.feed.AbstractFeed; import brooklyn.event.feed.AttributePollHandler; import brooklyn.event.feed.DelegatingPollHandler; import brooklyn.event.feed.Poller; + import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.internal.ssh.SshTool; + import brooklyn.util.time.Duration; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/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 040d887..c06c013 100644 --- a/core/src/main/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeed.java +++ b/core/src/main/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeed.java @@ -38,6 +38,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,9 +50,10 @@ import brooklyn.event.basic.Sensors; import brooklyn.event.feed.AbstractFeed; import brooklyn.event.feed.PollHandler; import brooklyn.event.feed.Poller; + import org.apache.brooklyn.location.basic.WinRmMachineLocation; + import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.time.Duration; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java b/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java index ab303a0..afa015f 100644 --- a/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java +++ b/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java @@ -41,6 +41,10 @@ import org.apache.brooklyn.api.management.SubscriptionHandle; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.policy.EntityAdjunct; import org.apache.brooklyn.core.management.internal.SubscriptionTracker; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.FlagUtils; +import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,10 +57,6 @@ import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.flags.FlagUtils; -import brooklyn.util.flags.SetFromFlag; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.guava.Maybe; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/core/src/main/java/brooklyn/policy/basic/ConfigMapImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/policy/basic/ConfigMapImpl.java b/core/src/main/java/brooklyn/policy/basic/ConfigMapImpl.java index 825720a..467eb05 100644 --- a/core/src/main/java/brooklyn/policy/basic/ConfigMapImpl.java +++ b/core/src/main/java/brooklyn/policy/basic/ConfigMapImpl.java @@ -25,6 +25,8 @@ import java.util.Map; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.core.util.internal.ConfigKeySelfExtracting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,9 +40,7 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.Sanitizer; import brooklyn.event.basic.StructuredConfigKey; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.guava.Maybe; -import brooklyn.util.internal.ConfigKeySelfExtracting; public class ConfigMapImpl extends AbstractConfigMapImpl { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/core/src/main/java/brooklyn/util/BrooklynLanguageExtensions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/BrooklynLanguageExtensions.java b/core/src/main/java/brooklyn/util/BrooklynLanguageExtensions.java deleted file mode 100644 index 86aac7e..0000000 --- a/core/src/main/java/brooklyn/util/BrooklynLanguageExtensions.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package brooklyn.util; - -import java.util.concurrent.atomic.AtomicBoolean; - -import org.apache.brooklyn.core.internal.BrooklynInitialization; - -import brooklyn.util.internal.TimeExtras; - -/** @deprecated since 0.7.0 use {@link BrooklynInitialization} */ -public class BrooklynLanguageExtensions { - - private BrooklynLanguageExtensions() {} - - private static AtomicBoolean done = new AtomicBoolean(false); - - public synchronized static void reinit() { - done.set(false); - init(); - } - - /** performs the language extensions required for this project */ - public synchronized static void init() { - if (done.getAndSet(true)) return; - TimeExtras.init(); - BrooklynInitialization.initPortRanges(); - } - - static { BrooklynInitialization.initLegacyLanguageExtensions(); } - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/core/src/main/java/brooklyn/util/BrooklynMavenArtifacts.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/BrooklynMavenArtifacts.java b/core/src/main/java/brooklyn/util/BrooklynMavenArtifacts.java deleted file mode 100644 index 50a5879..0000000 --- a/core/src/main/java/brooklyn/util/BrooklynMavenArtifacts.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package brooklyn.util; - -import brooklyn.BrooklynVersion; -import brooklyn.util.maven.MavenArtifact; -import brooklyn.util.maven.MavenRetriever; -import brooklyn.util.text.Strings; - -public class BrooklynMavenArtifacts { - - public static MavenArtifact jar(String artifactId) { - return artifact(null, artifactId, "jar"); - } - - public static MavenArtifact artifact(String subgroupUnderIoBrooklyn, String artifactId, String packaging) { - return artifact(subgroupUnderIoBrooklyn, artifactId, packaging, null); - } - - public static MavenArtifact artifact(String subgroupUnderIoBrooklyn, String artifactId, String packaging, String classifier) { - return new MavenArtifact( - Strings.isEmpty(subgroupUnderIoBrooklyn) ? "org.apache.brooklyn" : "org.apache.brooklyn."+subgroupUnderIoBrooklyn, - artifactId, packaging, classifier, BrooklynVersion.get()); - } - - public static String localUrlForJar(String artifactId) { - return MavenRetriever.localUrl(jar(artifactId)); - } - - public static String localUrl(String subgroupUnderIoBrooklyn, String artifactId, String packaging) { - return MavenRetriever.localUrl(artifact(subgroupUnderIoBrooklyn, artifactId, packaging)); - } - - public static String hostedUrlForJar(String artifactId) { - return MavenRetriever.hostedUrl(jar(artifactId)); - } - - public static String hostedUrl(String subgroupUnderIoBrooklyn, String artifactId, String packaging) { - return MavenRetriever.hostedUrl(artifact(subgroupUnderIoBrooklyn, artifactId, packaging)); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/699b3f65/core/src/main/java/brooklyn/util/BrooklynNetworkUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/util/BrooklynNetworkUtils.java b/core/src/main/java/brooklyn/util/BrooklynNetworkUtils.java deleted file mode 100644 index 0c1d39d..0000000 --- a/core/src/main/java/brooklyn/util/BrooklynNetworkUtils.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package brooklyn.util; - -import java.net.InetAddress; - -import brooklyn.config.BrooklynServiceAttributes; -import org.apache.brooklyn.location.geo.LocalhostExternalIpLoader; -import brooklyn.util.flags.TypeCoercions; -import brooklyn.util.net.Networking; - -public class BrooklynNetworkUtils { - - /** returns the externally-facing IP address from which this host comes, or 127.0.0.1 if not resolvable */ - public static String getLocalhostExternalIp() { - return LocalhostExternalIpLoader.getLocalhostIpQuicklyOrDefault(); - } - - /** returns a IP address for localhost paying attention to a system property to prevent lookup in some cases */ - public static InetAddress getLocalhostInetAddress() { - return TypeCoercions.coerce(JavaGroovyEquivalents.elvis(BrooklynServiceAttributes.LOCALHOST_IP_ADDRESS.getValue(), - Networking.getLocalHost()), InetAddress.class); - } - -}
