http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java b/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java index c646670..a2a44dd 100644 --- a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java +++ b/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java @@ -23,11 +23,11 @@ import java.util.Random; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNodeSaltImpl; import org.apache.brooklyn.entity.salt.SaltConfig; import org.apache.brooklyn.entity.salt.SaltLiveTestSupport; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java index fc65f28..587a152 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java @@ -37,8 +37,8 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.EntityFunctions; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; -import org.apache.brooklyn.location.core.SupportsPortForwarding; +import org.apache.brooklyn.core.location.SupportsPortForwarding; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; import org.apache.brooklyn.sensor.feed.AbstractFeed; import org.apache.brooklyn.sensor.feed.AttributePollHandler; import org.apache.brooklyn.sensor.feed.PollHandler; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java index 60df1fa..54bce7e 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java @@ -21,10 +21,9 @@ package org.apache.brooklyn.entity.nosql.hazelcast; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.util.core.flags.SetFromFlag; -import org.apache.brooklyn.location.core.PortRanges; - import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.java.UsesJava; import org.apache.brooklyn.entity.java.UsesJmx; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java index 36fd1be..6ee1729 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java @@ -24,11 +24,11 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.sensor.feed.http.HttpFeed; import org.apache.brooklyn.sensor.feed.http.HttpPollConfig; import org.apache.brooklyn.sensor.feed.http.HttpValueFunctions; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java index 9c51e67..f1fd071 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java @@ -39,6 +39,8 @@ import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic; import org.apache.brooklyn.core.entity.trait.Startable; +import org.apache.brooklyn.core.location.Locations; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; import org.apache.brooklyn.core.mgmt.BrooklynTaskTags; import org.apache.brooklyn.effector.core.EffectorBody; import org.apache.brooklyn.effector.core.Effectors; @@ -52,8 +54,6 @@ import org.apache.brooklyn.entity.software.base.lifecycle.MachineLifecycleEffect import org.apache.http.HttpStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; -import org.apache.brooklyn.location.core.Locations; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.sensor.feed.ConfigToAttributes; import org.apache.brooklyn.sensor.feed.http.HttpFeed; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java index a5c9fc7..4b5ddc8 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java @@ -25,11 +25,11 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; +import org.apache.brooklyn.core.location.Machines; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.software.base.lifecycle.MachineLifecycleEffectorTasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.core.Machines; import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; import org.apache.brooklyn.util.collections.Jsonya; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxSupport.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxSupport.java b/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxSupport.java index b5ae171..62fa577 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxSupport.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxSupport.java @@ -29,10 +29,10 @@ import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.apache.brooklyn.core.entity.EntityInternal; +import org.apache.brooklyn.core.location.Locations; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; -import org.apache.brooklyn.location.core.Locations; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.feed.jmx.JmxHelper; import org.apache.brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/main/java/org/apache/brooklyn/entity/java/UsesJmx.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/java/UsesJmx.java b/software/base/src/main/java/org/apache/brooklyn/entity/java/UsesJmx.java index 7939dae..dedbbd9 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/java/UsesJmx.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/java/UsesJmx.java @@ -27,7 +27,7 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.location.core.PortRanges; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.sensor.core.AttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineEntityImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineEntityImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineEntityImpl.java index ef5d0ba..6ebca42 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineEntityImpl.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineEntityImpl.java @@ -23,10 +23,10 @@ import java.util.concurrent.TimeoutException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.brooklyn.core.location.Machines; import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.apache.brooklyn.entity.software.base.EmptySoftwareProcessDriver; import org.apache.brooklyn.entity.software.base.EmptySoftwareProcessImpl; -import org.apache.brooklyn.location.core.Machines; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.feed.ssh.SshFeed; import org.apache.brooklyn.sensor.feed.ssh.SshPollConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPool.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPool.java b/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPool.java index 3df9ab0..42a4665 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPool.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPool.java @@ -34,11 +34,11 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.annotation.Effector; import org.apache.brooklyn.core.annotation.EffectorParam; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; +import org.apache.brooklyn.core.location.dynamic.LocationOwner; import org.apache.brooklyn.effector.core.MethodEffector; import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.machine.MachineEntity; -import org.apache.brooklyn.location.cloud.CloudLocationConfig; -import org.apache.brooklyn.location.dynamic.LocationOwner; import org.apache.brooklyn.sensor.core.Sensors; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolImpl.java index 674f78f..6089e3f 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolImpl.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolImpl.java @@ -37,14 +37,14 @@ import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.EntityInternal; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.trait.Startable; +import org.apache.brooklyn.core.location.BasicLocationDefinition; +import org.apache.brooklyn.core.location.Machines; +import org.apache.brooklyn.core.location.dynamic.DynamicLocation; import org.apache.brooklyn.effector.core.Effectors; import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; import org.apache.brooklyn.entity.group.DynamicClusterImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.core.BasicLocationDefinition; -import org.apache.brooklyn.location.core.Machines; -import org.apache.brooklyn.location.dynamic.DynamicLocation; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocation.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocation.java b/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocation.java index c9d4fbb..c59af7f 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocation.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocation.java @@ -33,8 +33,8 @@ import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.location.core.AbstractLocation; -import org.apache.brooklyn.location.dynamic.DynamicLocation; +import org.apache.brooklyn.core.location.AbstractLocation; +import org.apache.brooklyn.core.location.dynamic.DynamicLocation; import org.apache.brooklyn.util.core.flags.SetFromFlag; public class ServerPoolLocation extends AbstractLocation implements MachineProvisioningLocation<MachineLocation>, http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocationResolver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocationResolver.java b/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocationResolver.java index c6165ab..d1e4909 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocationResolver.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocationResolver.java @@ -32,6 +32,10 @@ import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.LocationResolver.EnableableLocationResolver; import org.apache.brooklyn.api.mgmt.ManagementContext; +import org.apache.brooklyn.core.location.BasicLocationRegistry; +import org.apache.brooklyn.core.location.LocationPropertiesFromBrooklynProperties; +import org.apache.brooklyn.core.location.dynamic.DynamicLocation; +import org.apache.brooklyn.core.location.internal.LocationInternal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,10 +43,6 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import org.apache.brooklyn.location.core.BasicLocationRegistry; -import org.apache.brooklyn.location.core.LocationPropertiesFromBrooklynProperties; -import org.apache.brooklyn.location.core.internal.LocationInternal; -import org.apache.brooklyn.location.dynamic.DynamicLocation; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.text.KeyValueParser; import org.apache.brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerDriverLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerDriverLifecycleEffectorTasks.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerDriverLifecycleEffectorTasks.java index 272e6e5..4d50fad 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerDriverLifecycleEffectorTasks.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerDriverLifecycleEffectorTasks.java @@ -30,6 +30,7 @@ import org.apache.brooklyn.api.mgmt.TaskAdaptable; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.core.entity.trait.StartableMethods; +import org.apache.brooklyn.core.location.LocationConfigKeys; import org.apache.brooklyn.entity.software.base.lifecycle.MachineLifecycleEffectorTasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +41,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.reflect.TypeToken; -import org.apache.brooklyn.location.core.LocationConfigKeys; import org.apache.brooklyn.util.collections.MutableSet; import org.apache.brooklyn.util.core.flags.TypeCoercions; import org.apache.brooklyn.util.core.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java index 98d8343..3dabbc9 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java @@ -49,10 +49,10 @@ import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle.Transition; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic; +import org.apache.brooklyn.core.location.LocationConfigKeys; +import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.cloud.CloudLocationConfig; -import org.apache.brooklyn.location.core.LocationConfigKeys; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.enricher.AbstractEnricher; import org.apache.brooklyn.sensor.feed.function.FunctionFeed; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java index f728859..5af6294 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java @@ -48,6 +48,10 @@ import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.core.entity.trait.StartableMethods; +import org.apache.brooklyn.core.location.AbstractLocation; +import org.apache.brooklyn.core.location.Locations; +import org.apache.brooklyn.core.location.Machines; +import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; import org.apache.brooklyn.core.mgmt.BrooklynTaskTags; import org.apache.brooklyn.effector.core.EffectorBody; import org.apache.brooklyn.effector.core.Effectors; @@ -69,10 +73,6 @@ import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import org.apache.brooklyn.location.cloud.CloudLocationConfig; -import org.apache.brooklyn.location.core.AbstractLocation; -import org.apache.brooklyn.location.core.Locations; -import org.apache.brooklyn.location.core.Machines; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.feed.ConfigToAttributes; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/main/java/org/apache/brooklyn/entity/system_service/InitdServiceInstaller.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/system_service/InitdServiceInstaller.java b/software/base/src/main/java/org/apache/brooklyn/entity/system_service/InitdServiceInstaller.java index c240a21..ce64518 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/system_service/InitdServiceInstaller.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/system_service/InitdServiceInstaller.java @@ -31,9 +31,9 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.EntityInternal; +import org.apache.brooklyn.core.location.cloud.names.AbstractCloudMachineNamer; import org.apache.brooklyn.effector.core.EffectorTasks; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.location.cloud.names.AbstractCloudMachineNamer; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.ResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/main/java/org/apache/brooklyn/sensor/ssh/SshEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/sensor/ssh/SshEffectorTasks.java b/software/base/src/main/java/org/apache/brooklyn/sensor/ssh/SshEffectorTasks.java index 463cce5..f4ae082 100644 --- a/software/base/src/main/java/org/apache/brooklyn/sensor/ssh/SshEffectorTasks.java +++ b/software/base/src/main/java/org/apache/brooklyn/sensor/ssh/SshEffectorTasks.java @@ -32,6 +32,7 @@ import org.apache.brooklyn.config.StringConfigMap; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.config.ConfigUtils; import org.apache.brooklyn.core.entity.EntityInternal; +import org.apache.brooklyn.core.location.internal.LocationInternal; import org.apache.brooklyn.core.mgmt.BrooklynTaskTags; import org.apache.brooklyn.effector.core.EffectorBody; import org.apache.brooklyn.effector.core.EffectorTasks; @@ -39,7 +40,6 @@ import org.apache.brooklyn.effector.core.EffectorTasks.EffectorTaskFactory; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.core.internal.LocationInternal; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.core.config.ConfigBag; import org.apache.brooklyn.util.core.internal.ssh.SshTool; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java index bfa67b7..0cfa8f4 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java @@ -38,6 +38,8 @@ import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.internal.BrooklynProperties; +import org.apache.brooklyn.core.location.Locations; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.core.objs.proxy.EntityProxyImpl; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.entity.brooklynnode.BrooklynEntityMirror; @@ -74,8 +76,6 @@ import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.core.Locations; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.ssh.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/test/java/org/apache/brooklyn/entity/java/VanillaJavaAppTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/java/VanillaJavaAppTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/java/VanillaJavaAppTest.java index 4a0ae78..e56243c 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/java/VanillaJavaAppTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/java/VanillaJavaAppTest.java @@ -45,6 +45,7 @@ import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.entity.java.JavaAppUtils; import org.apache.brooklyn.entity.java.UsesJava; @@ -63,7 +64,6 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/test/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocationResolverTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocationResolverTest.java index 6d5bd64..2a036e2 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocationResolverTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocationResolverTest.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.core.internal.BrooklynProperties; +import org.apache.brooklyn.core.location.dynamic.DynamicLocation; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.core.test.entity.TestApplication; @@ -43,7 +44,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; -import org.apache.brooklyn.location.dynamic.DynamicLocation; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; public class ServerPoolLocationResolverTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityRebindTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityRebindTest.java index f8d4611..104a046 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityRebindTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityRebindTest.java @@ -39,6 +39,7 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceProblemsLogic; +import org.apache.brooklyn.core.location.AbstractLocation; import org.apache.brooklyn.core.mgmt.rebind.RebindTestUtils; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestApplication; @@ -48,7 +49,6 @@ import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.core.AbstractLocation; import org.apache.brooklyn.location.ssh.SshMachineLocation; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityTest.java index ab8b809..0b738aa 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityTest.java @@ -51,6 +51,8 @@ import org.apache.brooklyn.core.entity.drivers.ReflectiveEntityDriverFactory; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.core.entity.trait.Startable; +import org.apache.brooklyn.core.location.Locations; +import org.apache.brooklyn.core.location.SimulatedLocation; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.effector.core.Effectors; @@ -92,8 +94,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import org.apache.brooklyn.location.byon.FixedListMachineProvisioningLocation; -import org.apache.brooklyn.location.core.Locations; -import org.apache.brooklyn.location.core.SimulatedLocation; import org.apache.brooklyn.location.ssh.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java index ba82034..01cba2b 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java @@ -38,8 +38,8 @@ import org.apache.brooklyn.entity.software.base.EmptySoftwareProcess; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.core.MultiLocation; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.multi.MultiLocation; import org.apache.brooklyn.test.Asserts; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/MachineDetailsEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/MachineDetailsEc2LiveTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/MachineDetailsEc2LiveTest.java index 8d345ab..f541085 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/MachineDetailsEc2LiveTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/MachineDetailsEc2LiveTest.java @@ -27,10 +27,10 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.MachineDetails; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.core.entity.trait.Startable; +import org.apache.brooklyn.core.location.BasicMachineDetails; +import org.apache.brooklyn.core.location.Locations; import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.entity.software.base.EmptySoftwareProcess; -import org.apache.brooklyn.location.core.BasicMachineDetails; -import org.apache.brooklyn.location.core.Locations; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/MachineDetailsGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/MachineDetailsGoogleComputeLiveTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/MachineDetailsGoogleComputeLiveTest.java index 97ff749..41b2016 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/MachineDetailsGoogleComputeLiveTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/MachineDetailsGoogleComputeLiveTest.java @@ -27,10 +27,10 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.MachineDetails; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.core.entity.trait.Startable; +import org.apache.brooklyn.core.location.BasicMachineDetails; +import org.apache.brooklyn.core.location.Locations; import org.apache.brooklyn.entity.AbstractGoogleComputeLiveTest; import org.apache.brooklyn.entity.software.base.EmptySoftwareProcess; -import org.apache.brooklyn.location.core.BasicMachineDetails; -import org.apache.brooklyn.location.core.Locations; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java index ac09a6f..7410c8a 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java @@ -27,12 +27,12 @@ import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.location.BasicOsDetails.OsVersions; import org.apache.brooklyn.core.mgmt.BrooklynTaskTags; import org.apache.brooklyn.entity.software.base.lifecycle.MachineLifecycleEffectorTasks; import org.apache.brooklyn.entity.stock.BasicStartable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.core.BasicOsDetails.OsVersions; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation.LocalhostMachine; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/test/java/org/apache/brooklyn/sensor/feed/jmx/JmxFeedTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/sensor/feed/jmx/JmxFeedTest.java b/software/base/src/test/java/org/apache/brooklyn/sensor/feed/jmx/JmxFeedTest.java index e35b2c1..bf2cdf9 100644 --- a/software/base/src/test/java/org/apache/brooklyn/sensor/feed/jmx/JmxFeedTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/sensor/feed/jmx/JmxFeedTest.java @@ -49,6 +49,8 @@ import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.location.PortRanges; +import org.apache.brooklyn.core.location.SimulatedLocation; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestApplicationImpl; import org.apache.brooklyn.core.test.entity.TestEntity; @@ -77,8 +79,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.testng.collections.Lists; -import org.apache.brooklyn.location.core.PortRanges; -import org.apache.brooklyn.location.core.SimulatedLocation; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/base/src/test/java/org/apache/brooklyn/sensor/feed/jmx/RebindJmxFeedTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/sensor/feed/jmx/RebindJmxFeedTest.java b/software/base/src/test/java/org/apache/brooklyn/sensor/feed/jmx/RebindJmxFeedTest.java index 91ccd44..fb8f516 100644 --- a/software/base/src/test/java/org/apache/brooklyn/sensor/feed/jmx/RebindJmxFeedTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/sensor/feed/jmx/RebindJmxFeedTest.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.sensor.Feed; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.core.mgmt.rebind.RebindTestFixtureWithApp; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.core.test.entity.TestEntityImpl; @@ -48,7 +49,6 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java index 55da7fb..cdcbefb 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java @@ -23,12 +23,12 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.java.UsesJava; import org.apache.brooklyn.entity.java.UsesJavaMXBeans; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.sensor.core.AttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNode.java index 563c392..4063aef 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNode.java @@ -26,10 +26,10 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.config.MapConfigKey; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.entity.database.DatabaseNode; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNodeImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNodeImpl.java index f613046..1c803c2 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNodeImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNodeImpl.java @@ -20,9 +20,9 @@ package org.apache.brooklyn.entity.database.mariadb; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.brooklyn.core.location.Locations; import org.apache.brooklyn.effector.core.EffectorBody; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; -import org.apache.brooklyn.location.core.Locations; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.feed.ssh.SshFeed; import org.apache.brooklyn.sensor.feed.ssh.SshPollConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java index 728614d..79a12b8 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java @@ -28,10 +28,10 @@ import org.apache.brooklyn.core.annotation.EffectorParam; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.config.MapConfigKey; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.effector.core.MethodEffector; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java index 1fd8b6d..f8f620f 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java @@ -21,11 +21,11 @@ package org.apache.brooklyn.entity.database.mysql; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.core.location.Locations; import org.apache.brooklyn.effector.core.EffectorBody; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.core.Locations; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.feed.ssh.SshFeed; import org.apache.brooklyn.sensor.feed.ssh.SshPollConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java index 0de7fe4..d1384f2 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java @@ -40,7 +40,7 @@ import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.Entities; -import org.apache.brooklyn.location.core.BasicOsDetails.OsVersions; +import org.apache.brooklyn.core.location.BasicOsDetails.OsVersions; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java index 08d46c1..04e3c83 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java @@ -24,12 +24,12 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.objs.HasShortName; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.effector.core.Effectors; import org.apache.brooklyn.entity.database.DatabaseNode; import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java index 1c8fd40..d886bf9 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java @@ -22,6 +22,7 @@ import org.apache.brooklyn.api.effector.Effector; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.location.Locations; import org.apache.brooklyn.effector.core.EffectorBody; import org.apache.brooklyn.effector.core.Effectors; import org.apache.brooklyn.entity.chef.ChefConfig; @@ -30,7 +31,6 @@ import org.apache.brooklyn.entity.chef.ChefServerTasks; import org.apache.brooklyn.entity.stock.EffectorStartableImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.core.Locations; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.feed.ssh.SshFeed; import org.apache.brooklyn.sensor.feed.ssh.SshPollConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java index 50fb103..fe11c34 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java @@ -30,7 +30,7 @@ import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.core.entity.Entities; -import org.apache.brooklyn.location.core.PortRanges; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java index e07d693..0e3489e 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java @@ -21,10 +21,10 @@ package org.apache.brooklyn.entity.database.postgresql; import java.util.Arrays; import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.core.location.PortRanges; import org.testng.annotations.Test; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.net.Protocol; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java index 1e3a418..8ded942 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java @@ -20,12 +20,12 @@ package org.apache.brooklyn.entity.database.rubyrep; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.location.PortRanges; import org.testng.annotations.Test; import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode; -import org.apache.brooklyn.location.core.PortRanges; public class RubyRepEc2LiveTest extends AbstractEc2LiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java index 6cc01d1..76f84ec 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.core.internal.BrooklynProperties; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.test.entity.TestApplication; import org.slf4j.Logger; @@ -42,7 +43,6 @@ import org.apache.brooklyn.entity.database.mysql.MySqlIntegrationTest; import org.apache.brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; public class RubyRepIntegrationTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java index 361b8d6..f6a77b0 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java @@ -22,11 +22,11 @@ import java.util.Arrays; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.location.PortRanges; import org.testng.annotations.Test; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.net.Protocol; import org.apache.brooklyn.util.ssh.IptablesCommands; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java index 0e71a83..c7d7829 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java @@ -23,11 +23,11 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.messaging.MessageBroker; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormSshDriver.java index 10889ca..8236e5b 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormSshDriver.java @@ -27,12 +27,12 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.location.Machines; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble; -import org.apache.brooklyn.location.core.Machines; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServer.java ---------------------------------------------------------------------- diff --git a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServer.java b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServer.java index 925e620..96c56fb 100644 --- a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServer.java +++ b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServer.java @@ -32,9 +32,9 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.annotation.Effector; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.entity.group.DynamicGroup; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerImpl.java ---------------------------------------------------------------------- diff --git a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerImpl.java b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerImpl.java index b9db449..114acea 100644 --- a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerImpl.java +++ b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerImpl.java @@ -31,6 +31,7 @@ import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.api.sensor.Sensor; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; +import org.apache.brooklyn.core.location.Machines; import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; import org.apache.brooklyn.entity.group.DynamicGroup; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; @@ -57,7 +58,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; import com.google.common.collect.Multimaps; -import org.apache.brooklyn.location.core.Machines; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.guava.Maybe; import org.apache.brooklyn.util.net.Cidr; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java index 0286458..73d135f 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java @@ -40,13 +40,13 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.EntityPredicates; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic; +import org.apache.brooklyn.core.location.Machines; import org.apache.brooklyn.effector.core.EffectorBody; import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; import org.apache.brooklyn.entity.group.DynamicClusterImpl; import org.apache.brooklyn.entity.group.DynamicGroup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.core.Machines; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java index fd39e5a..b945bdd 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java @@ -30,11 +30,11 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.BrooklynConfigKeys; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.java.UsesJavaMXBeans; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java index f6afe2e..a096e33 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java @@ -38,13 +38,13 @@ import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.location.Machines; +import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; import org.apache.brooklyn.effector.core.EffectorBody; import org.apache.brooklyn.entity.java.JavaAppUtils; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.cloud.CloudLocationConfig; -import org.apache.brooklyn.location.core.Machines; import org.apache.brooklyn.policy.enricher.RollingTimeWindowMeanEnricher; import org.apache.brooklyn.policy.enricher.TimeWeightedDeltaEnricher; import org.apache.brooklyn.sensor.core.DependentConfiguration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java index 660551a..778b40b 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java @@ -33,6 +33,8 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.mgmt.TaskWrapper; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.location.Machines; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,8 +45,6 @@ import com.google.common.collect.ImmutableSet; import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; import org.apache.brooklyn.entity.java.UsesJmx; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; -import org.apache.brooklyn.location.core.Machines; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java index 4f237c2..e0e91ed 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java @@ -39,13 +39,13 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.EntityInternal; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.core.entity.trait.Startable; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; import org.apache.brooklyn.effector.core.Effectors; import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; import org.apache.brooklyn.entity.group.DynamicClusterImpl; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.sensor.feed.http.HttpFeed; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java index abfb3b8..318ac74 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java @@ -31,13 +31,13 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; +import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; import org.apache.brooklyn.effector.core.EffectorBody; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.http.auth.UsernamePasswordCredentials; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; -import org.apache.brooklyn.location.cloud.CloudLocationConfig; import org.apache.brooklyn.sensor.feed.http.HttpFeed; import org.apache.brooklyn.sensor.feed.http.HttpPollConfig; import org.apache.brooklyn.sensor.feed.http.HttpValueFunctions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java index a984740..d2b189f 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java @@ -38,9 +38,9 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.drivers.downloads.BasicDownloadRequirement; import org.apache.brooklyn.core.entity.drivers.downloads.DownloadProducerFromUrlAttribute; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.sensor.feed.http.HttpValueFunctions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java index 1931f74..724f246 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java @@ -19,8 +19,8 @@ package org.apache.brooklyn.entity.nosql.couchbase; import org.apache.brooklyn.core.config.render.RendererHints; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.sensor.feed.http.HttpFeed; import org.apache.brooklyn.sensor.feed.http.HttpPollConfig; import org.apache.brooklyn.sensor.feed.http.HttpValueFunctions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java index 5f230b0..1cf108e 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java @@ -23,10 +23,10 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; import org.apache.brooklyn.entity.database.DatastoreMixins; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java index 30e0401..b2cb577 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java @@ -21,8 +21,8 @@ package org.apache.brooklyn.entity.nosql.elasticsearch; import static com.google.common.base.Preconditions.checkNotNull; import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.sensor.feed.http.HttpFeed; import org.apache.brooklyn.sensor.feed.http.HttpPollConfig; import org.apache.brooklyn.sensor.feed.http.HttpValueFunctions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSupport.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSupport.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSupport.java index 8ca8ee0..3a6c398 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSupport.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSupport.java @@ -20,6 +20,7 @@ package org.apache.brooklyn.entity.nosql.mongodb; import java.net.UnknownHostException; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; import org.bson.BSONObject; import org.bson.BasicBSONObject; import org.slf4j.Logger; @@ -36,8 +37,6 @@ import com.mongodb.MongoClientOptions; import com.mongodb.MongoException; import com.mongodb.ServerAddress; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; - /** * Manages connections to standalone MongoDB servers. * http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java index 89d7504..de56c8a 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java @@ -25,11 +25,11 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.config.render.RendererHints; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.bson.BasicBSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.sensor.feed.function.FunctionFeed; import org.apache.brooklyn.sensor.feed.function.FunctionPollConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/ReplicaSetConfig.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/ReplicaSetConfig.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/ReplicaSetConfig.java index 5d2723d..9ea240b 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/ReplicaSetConfig.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/ReplicaSetConfig.java @@ -23,6 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Iterator; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; import org.bson.BSONObject; import org.bson.BasicBSONObject; import org.bson.types.BasicBSONList; @@ -32,8 +33,6 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Optional; import com.google.common.net.HostAndPort; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; - /** * Simplifies the creation of configuration objects for Mongo DB replica sets. * <p/> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java index 24bbc96..9ddabe4 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeImpl.java @@ -30,10 +30,10 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; +import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.entity.webapp.WebAppServiceMethods; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; -import org.apache.brooklyn.location.cloud.CloudLocationConfig; import org.apache.brooklyn.sensor.core.AttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.sensor.feed.http.HttpFeed; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java index e88ec4a..1045762 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java @@ -25,11 +25,11 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.BrooklynConfigKeys; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.entity.java.UsesJava; import org.apache.brooklyn.entity.java.UsesJavaMXBeans; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerImpl.java index 26c93e9..903fc58 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerImpl.java @@ -19,8 +19,8 @@ package org.apache.brooklyn.entity.nosql.solr; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.sensor.feed.http.HttpFeed; import org.apache.brooklyn.sensor.feed.http.HttpPollConfig; import org.apache.brooklyn.sensor.feed.http.HttpValueFunctions;
