http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLoginLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLoginLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLoginLiveTest.java index 5a17a5a..74b408c 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLoginLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLoginLiveTest.java @@ -27,9 +27,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; - -import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableMap; import brooklyn.util.os.Os; import brooklyn.util.stream.Streams;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/LiveTestEntity.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/LiveTestEntity.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/LiveTestEntity.java index 0ff4474..b1896d7 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/LiveTestEntity.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/LiveTestEntity.java @@ -21,15 +21,16 @@ package org.apache.brooklyn.location.jclouds; import java.util.Collection; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.NoMachinesAvailableException; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Lifecycle; -import org.apache.brooklyn.location.MachineProvisioningLocation; + import org.apache.brooklyn.location.basic.LocationInternal; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java index 535b6a8..e3b749d 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java @@ -25,6 +25,7 @@ import static org.testng.Assert.assertTrue; import java.io.File; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -33,7 +34,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.entity.rebind.RebindTestUtils; -import org.apache.brooklyn.location.OsDetails; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SimpleJcloudsLocationUserLoginAndConfigLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SimpleJcloudsLocationUserLoginAndConfigLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SimpleJcloudsLocationUserLoginAndConfigLiveTest.java index 3e33ce8..9ae5729 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SimpleJcloudsLocationUserLoginAndConfigLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SimpleJcloudsLocationUserLoginAndConfigLiveTest.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import org.apache.brooklyn.location.NoMachinesAvailableException; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SingleMachineProvisioningLocationJcloudsLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SingleMachineProvisioningLocationJcloudsLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SingleMachineProvisioningLocationJcloudsLiveTest.java index e9b9dd8..ce6aa58 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SingleMachineProvisioningLocationJcloudsLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SingleMachineProvisioningLocationJcloudsLiveTest.java @@ -31,7 +31,8 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.Test; import brooklyn.entity.basic.ConfigKeys; -import org.apache.brooklyn.location.MachineLocation; + +import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.location.basic.SingleMachineProvisioningLocation; public class SingleMachineProvisioningLocationJcloudsLiveTest extends AbstractJcloudsLiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java index fd93a7a..d302187 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertTrue; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,9 +35,10 @@ import org.testng.collections.Lists; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.NoMachinesAvailableException; + import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.jclouds.JcloudsLocation; + import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtensionTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtensionTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtensionTest.java index 12e89e3..84c90ab 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtensionTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtensionTest.java @@ -23,7 +23,7 @@ import static org.testng.Assert.assertTrue; import java.util.List; -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.location.jclouds.AbstractJcloudsLiveTest; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.jclouds.domain.LocationScope; @@ -32,7 +32,9 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.location.jclouds.JcloudsSshMachineLocation; + import brooklyn.management.internal.LocalManagementContext; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 020d652..4512b1d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1150,7 +1150,6 @@ <exclude>**/*.psd</exclude> <exclude>**/*.json</exclude> <exclude>**/*.plxarc</exclude> - <exclude>**/services/org.apache.brooklyn.location.LocationResolver</exclude> <exclude>**/src/test/resources/brooklyn/entity/basic/template_with_extra_substitutions.txt</exclude> <exclude>**/src/main/resources/banner.txt</exclude> <exclude>**/src/test/resources/ssl/certs/localhost/info.txt</exclude> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/main/java/brooklyn/policy/followthesun/DefaultFollowTheSunModel.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/followthesun/DefaultFollowTheSunModel.java b/policy/src/main/java/brooklyn/policy/followthesun/DefaultFollowTheSunModel.java index 51d9ae0..922b33d 100644 --- a/policy/src/main/java/brooklyn/policy/followthesun/DefaultFollowTheSunModel.java +++ b/policy/src/main/java/brooklyn/policy/followthesun/DefaultFollowTheSunModel.java @@ -32,8 +32,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.location.basic.AbstractLocation; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunModel.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunModel.java b/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunModel.java index a76e37c..a181ae4 100644 --- a/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunModel.java +++ b/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunModel.java @@ -21,7 +21,7 @@ package brooklyn.policy.followthesun; import java.util.Map; import java.util.Set; -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; /** * Captures the state of items, containers and locations for the purpose of moving items around http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunParameters.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunParameters.java b/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunParameters.java index 9283c7f..2b2d9af 100644 --- a/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunParameters.java +++ b/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunParameters.java @@ -23,8 +23,7 @@ import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; public class FollowTheSunParameters { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunPolicy.java b/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunPolicy.java index d89f1a8..1747424 100644 --- a/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunPolicy.java +++ b/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunPolicy.java @@ -36,12 +36,12 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Attributes; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.MachineProvisioningLocation; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.policy.followthesun.FollowTheSunPool.ContainerItemPair; import brooklyn.policy.loadbalancing.Movable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunStrategy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunStrategy.java b/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunStrategy.java index 078299d..e8ca636 100644 --- a/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunStrategy.java +++ b/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunStrategy.java @@ -26,10 +26,10 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.Location; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.Location; import brooklyn.policy.loadbalancing.Movable; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/main/java/brooklyn/policy/loadbalancing/BalanceablePoolModel.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/loadbalancing/BalanceablePoolModel.java b/policy/src/main/java/brooklyn/policy/loadbalancing/BalanceablePoolModel.java index f3e6b6a..33f9e0b 100644 --- a/policy/src/main/java/brooklyn/policy/loadbalancing/BalanceablePoolModel.java +++ b/policy/src/main/java/brooklyn/policy/loadbalancing/BalanceablePoolModel.java @@ -21,7 +21,7 @@ package brooklyn.policy.loadbalancing; import java.util.Map; import java.util.Set; -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; /** * Captures the state of a balanceable cluster of containers and all their constituent items, including workrates, http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/main/java/brooklyn/policy/loadbalancing/BalancingStrategy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/loadbalancing/BalancingStrategy.java b/policy/src/main/java/brooklyn/policy/loadbalancing/BalancingStrategy.java index fa7f3bb..714b70c 100644 --- a/policy/src/main/java/brooklyn/policy/loadbalancing/BalancingStrategy.java +++ b/policy/src/main/java/brooklyn/policy/loadbalancing/BalancingStrategy.java @@ -26,11 +26,10 @@ import java.util.Map.Entry; import java.util.Set; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.Location; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.Location; - /** * Represents an abstract algorithm for optimally balancing worker "items" among several "containers" based on the workloads * of the items, and corresponding high- and low-thresholds on the containers. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/main/java/brooklyn/policy/loadbalancing/DefaultBalanceablePoolModel.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/loadbalancing/DefaultBalanceablePoolModel.java b/policy/src/main/java/brooklyn/policy/loadbalancing/DefaultBalanceablePoolModel.java index 1a37ed6..7e273ba 100644 --- a/policy/src/main/java/brooklyn/policy/loadbalancing/DefaultBalanceablePoolModel.java +++ b/policy/src/main/java/brooklyn/policy/loadbalancing/DefaultBalanceablePoolModel.java @@ -28,8 +28,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.HashMultimap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/main/java/brooklyn/policy/loadbalancing/LocationConstraint.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/loadbalancing/LocationConstraint.java b/policy/src/main/java/brooklyn/policy/loadbalancing/LocationConstraint.java index 5399e89..5ae5723 100644 --- a/policy/src/main/java/brooklyn/policy/loadbalancing/LocationConstraint.java +++ b/policy/src/main/java/brooklyn/policy/loadbalancing/LocationConstraint.java @@ -18,7 +18,7 @@ */ package brooklyn.policy.loadbalancing; -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; /** * Temporary stub to resolve dependencies in ported LoadBalancingPolicy. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java index d317029..03f3f1d 100644 --- a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java +++ b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java @@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -36,8 +37,9 @@ import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.rebind.RebindTestFixtureWithApp; import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.util.time.Duration; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java b/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java index 5f12e62..c8855f2 100644 --- a/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java +++ b/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java @@ -29,6 +29,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; @@ -40,9 +42,9 @@ import org.testng.annotations.BeforeMethod; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.DynamicGroup; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.policy.loadbalancing.BalanceableContainer; import brooklyn.policy.loadbalancing.MockContainerEntity; import brooklyn.policy.loadbalancing.MockItemEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunModelTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunModelTest.java b/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunModelTest.java index 84f4808..9b16a2a 100644 --- a/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunModelTest.java +++ b/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunModelTest.java @@ -25,9 +25,9 @@ import static org.testng.Assert.assertTrue; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.policy.loadbalancing.MockContainerEntity; import brooklyn.policy.loadbalancing.MockContainerEntityImpl; import brooklyn.policy.loadbalancing.MockItemEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java b/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java index 24c1476..a67e24d 100644 --- a/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java +++ b/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java @@ -29,13 +29,15 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.location.Location; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.policy.loadbalancing.BalanceableContainer; import brooklyn.policy.loadbalancing.MockContainerEntity; import brooklyn.policy.loadbalancing.MockItemEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java b/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java index feef57d..1f5e5db 100644 --- a/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java +++ b/policy/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java @@ -31,13 +31,15 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.api.location.Location; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.policy.loadbalancing.MockContainerEntity; import brooklyn.policy.loadbalancing.MockItemEntity; import brooklyn.policy.loadbalancing.Movable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/test/java/brooklyn/policy/ha/HaPolicyRebindTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/HaPolicyRebindTest.java b/policy/src/test/java/brooklyn/policy/ha/HaPolicyRebindTest.java index 3088e78..12a5e1e 100644 --- a/policy/src/test/java/brooklyn/policy/ha/HaPolicyRebindTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/HaPolicyRebindTest.java @@ -30,6 +30,8 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.entity.TestApplication; @@ -42,9 +44,9 @@ import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.rebind.RebindTestFixtureWithApp; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java b/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java index b8e5379..f92f921 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java @@ -31,6 +31,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.EntityTestUtils; @@ -53,9 +55,9 @@ import brooklyn.entity.basic.QuorumCheck; import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers; import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.trait.FailingEntity; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java b/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java index f72fed3..672addb 100644 --- a/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java +++ b/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java @@ -28,12 +28,12 @@ import java.util.concurrent.locks.ReentrantLock; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.location.Location; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractGroupImpl; import brooklyn.entity.basic.Attributes; -import org.apache.brooklyn.location.Location; import brooklyn.util.collections.MutableList; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java index 7fc4ea7..bf7454d 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java +++ b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java @@ -28,11 +28,11 @@ import java.io.StringReader; import java.util.Map; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.location.Location; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import org.apache.brooklyn.location.Location; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java index f7d2122..1a926a5 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java @@ -23,6 +23,9 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.api.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,10 +39,9 @@ import com.google.common.reflect.TypeToken; import brooklyn.config.ConfigKey; import brooklyn.entity.software.MachineLifecycleEffectorTasks; import brooklyn.entity.trait.StartableMethods; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.MachineProvisioningLocation; -import org.apache.brooklyn.location.PortRange; + import org.apache.brooklyn.location.basic.LocationConfigKeys; + import brooklyn.util.collections.MutableSet; import brooklyn.util.flags.TypeCoercions; import brooklyn.util.guava.Maybe; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/java/brooklyn/entity/basic/SameServerEntity.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SameServerEntity.java b/software/base/src/main/java/brooklyn/entity/basic/SameServerEntity.java index 09f8dea..080cb87 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SameServerEntity.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SameServerEntity.java @@ -23,12 +23,12 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.BasicAttributeSensor; -import org.apache.brooklyn.location.MachineProvisioningLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.QuorumCheck; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java b/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java index 7bfdb59..32050fd 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java @@ -22,11 +22,11 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collection; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers; import brooklyn.entity.software.MachineLifecycleEffectorTasks; -import org.apache.brooklyn.location.Location; import brooklyn.util.collections.QuorumCheck; import brooklyn.util.config.ConfigBag; import brooklyn.util.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java index de12a0c..cf0dd6b 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Lifecycle.Transition; @@ -31,7 +32,6 @@ import brooklyn.entity.trait.Startable; import brooklyn.event.basic.AttributeSensorAndConfigKey; import brooklyn.event.basic.MapConfigKey; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.MachineProvisioningLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.flags.SetFromFlag; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java index 5af5a27..1067333 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java @@ -20,6 +20,8 @@ package brooklyn.entity.basic; import java.util.Map; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,8 +31,6 @@ import brooklyn.entity.basic.SoftwareProcess.RestartSoftwareParameters; import brooklyn.entity.basic.SoftwareProcess.RestartSoftwareParameters.RestartMachineMode; import brooklyn.entity.software.MachineLifecycleEffectorTasks; import brooklyn.entity.trait.StartableMethods; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.MachineProvisioningLocation; import brooklyn.util.config.ConfigBag; import brooklyn.util.task.DynamicTasks; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java index f96b961..87d4710 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java @@ -36,6 +36,10 @@ import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity; import org.apache.brooklyn.api.entity.drivers.EntityDriverManager; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.policy.EnricherSpec; import org.slf4j.Logger; @@ -47,13 +51,11 @@ import brooklyn.entity.basic.Lifecycle.Transition; import brooklyn.entity.basic.ServiceStateLogic.ServiceNotUpLogic; import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.function.FunctionPollConfig; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.MachineProvisioningLocation; -import org.apache.brooklyn.location.PortRange; + import org.apache.brooklyn.location.basic.LocationConfigKeys; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.cloud.CloudLocationConfig; + import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java index ca7d561..9f6bf82 100644 --- a/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.MachineLocation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,8 +31,9 @@ import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.software.MachineLifecycleEffectorTasks; import brooklyn.entity.software.SshEffectorTasks; -import org.apache.brooklyn.location.MachineLocation; + import org.apache.brooklyn.location.basic.Machines; + import brooklyn.util.collections.Jsonya; import brooklyn.util.collections.Jsonya.Navigator; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java b/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java index 6bc9de4..141c5e5 100644 --- a/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java +++ b/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java @@ -23,6 +23,7 @@ import java.security.cert.Certificate; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.location.PortRange; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; @@ -30,8 +31,9 @@ import brooklyn.event.basic.AttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import org.apache.brooklyn.location.PortRange; + import org.apache.brooklyn.location.basic.PortRanges; + import brooklyn.util.flags.SetFromFlag; public interface UsesJmx extends UsesJava { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/java/brooklyn/entity/pool/ServerPool.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/pool/ServerPool.java b/software/base/src/main/java/brooklyn/entity/pool/ServerPool.java index c0b2b5f..65c1a4c 100644 --- a/software/base/src/main/java/brooklyn/entity/pool/ServerPool.java +++ b/software/base/src/main/java/brooklyn/entity/pool/ServerPool.java @@ -28,6 +28,8 @@ import org.apache.brooklyn.api.entity.Entity; 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.MachineLocation; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; @@ -37,8 +39,7 @@ import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.machine.MachineEntity; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.NoMachinesAvailableException; + import org.apache.brooklyn.location.cloud.CloudLocationConfig; import org.apache.brooklyn.location.dynamic.LocationOwner; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java index 2876b31..871e111 100644 --- a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java +++ b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java @@ -24,6 +24,10 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationDefinition; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.LocationManager; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.policy.PolicySpec; @@ -40,13 +44,11 @@ import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.DynamicClusterImpl; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationDefinition; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.NoMachinesAvailableException; + import org.apache.brooklyn.location.basic.BasicLocationDefinition; import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.dynamic.DynamicLocation; + import brooklyn.util.collections.MutableMap; import brooklyn.util.guava.Maybe; import brooklyn.util.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocation.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocation.java b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocation.java index 7123760..704459b 100644 --- a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocation.java +++ b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocation.java @@ -30,11 +30,13 @@ import com.google.common.collect.Maps; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.MachineProvisioningLocation; -import org.apache.brooklyn.location.NoMachinesAvailableException; + +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.dynamic.DynamicLocation; + import brooklyn.util.flags.SetFromFlag; public class ServerPoolLocation extends AbstractLocation implements MachineProvisioningLocation<MachineLocation>, http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocationResolver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocationResolver.java b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocationResolver.java index 2de1da2..0383dda 100644 --- a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocationResolver.java +++ b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolLocationResolver.java @@ -27,6 +27,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.Location; +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.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,14 +39,11 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationRegistry; -import org.apache.brooklyn.location.LocationResolver.EnableableLocationResolver; -import org.apache.brooklyn.location.LocationSpec; import org.apache.brooklyn.location.basic.BasicLocationRegistry; import org.apache.brooklyn.location.basic.LocationInternal; import org.apache.brooklyn.location.basic.LocationPropertiesFromBrooklynProperties; import org.apache.brooklyn.location.dynamic.DynamicLocation; + import brooklyn.util.collections.MutableMap; import brooklyn.util.text.KeyValueParser; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java index 8c68442..97add55 100644 --- a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java @@ -30,8 +30,13 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.MachineManagementMixins; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; +import org.apache.brooklyn.api.location.MachineManagementMixins.SuspendsMachines; import org.apache.brooklyn.api.management.Task; -import org.apache.brooklyn.location.MachineManagementMixins; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,17 +68,14 @@ import brooklyn.entity.effector.Effectors; import brooklyn.entity.trait.Startable; import brooklyn.entity.trait.StartableMethods; import brooklyn.event.feed.ConfigToAttributes; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.MachineManagementMixins.SuspendsMachines; -import org.apache.brooklyn.location.MachineProvisioningLocation; -import org.apache.brooklyn.location.NoMachinesAvailableException; + import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.cloud.CloudLocationConfig; + 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/d32d672a/software/base/src/main/java/brooklyn/entity/software/ProvidesProvisioningFlags.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/ProvidesProvisioningFlags.java b/software/base/src/main/java/brooklyn/entity/software/ProvidesProvisioningFlags.java index 28888e9..91c6666 100644 --- a/software/base/src/main/java/brooklyn/entity/software/ProvidesProvisioningFlags.java +++ b/software/base/src/main/java/brooklyn/entity/software/ProvidesProvisioningFlags.java @@ -18,7 +18,8 @@ */ package brooklyn.entity.software; -import org.apache.brooklyn.location.MachineProvisioningLocation; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; + import brooklyn.util.config.ConfigBag; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java index c3590b4..e40170c 100644 --- a/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java @@ -25,6 +25,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,9 +40,10 @@ import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.EffectorTasks; import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.LocationInternal; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.config.ConfigBag; import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.ssh.BashCommands; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver ---------------------------------------------------------------------- diff --git a/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver b/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver new file mode 100644 index 0000000..8ab42e7 --- /dev/null +++ b/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver @@ -0,0 +1,19 @@ +# +# 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. +# +brooklyn.entity.pool.ServerPoolLocationResolver http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.location.LocationResolver ---------------------------------------------------------------------- diff --git a/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.location.LocationResolver b/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.location.LocationResolver deleted file mode 100644 index 2a041b4..0000000 --- a/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.location.LocationResolver +++ /dev/null @@ -1 +0,0 @@ -brooklyn.entity.pool.ServerPoolLocationResolver http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java index 40a906c..7a8b099 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java @@ -25,9 +25,11 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; -import org.apache.brooklyn.location.Location; + +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.location.jclouds.JcloudsLocationConfig; + import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java index 72bf949..ecc4adc 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java @@ -21,6 +21,7 @@ package brooklyn.entity; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; @@ -30,7 +31,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java index 3afd6c3..a8f15f5 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java @@ -21,6 +21,7 @@ package brooklyn.entity; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; @@ -34,7 +35,6 @@ import com.google.common.collect.ImmutableMap; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; import brooklyn.util.text.StringShortener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java b/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java index 602eefe..0e6db9e 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java @@ -24,14 +24,13 @@ import static org.testng.Assert.assertTrue; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import org.apache.brooklyn.location.Location; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java index 21ba4e8..aa46dd1 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java @@ -27,6 +27,7 @@ import java.util.List; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,9 +39,10 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.SoftwareProcessEntityTest.MyService; import brooklyn.entity.basic.SoftwareProcessEntityTest.SimulatedDriver; import brooklyn.event.basic.DependentConfiguration; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.test.Asserts; import brooklyn.util.task.TaskInternal; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java index fd70e7e..7ae7b54 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java @@ -30,6 +30,9 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; @@ -41,11 +44,10 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.ServiceStateLogic.ServiceProblemsLogic; import brooklyn.entity.basic.SoftwareProcessEntityTest.MyService; import brooklyn.entity.rebind.RebindTestUtils; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.MachineProvisioningLocation; -import org.apache.brooklyn.location.NoMachinesAvailableException; + import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.flags.SetFromFlag; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java index b66e3dd..3d8ddda 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java @@ -34,6 +34,9 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.management.EntityManager; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskAdaptable; @@ -63,13 +66,12 @@ import brooklyn.entity.effector.Effectors; import brooklyn.entity.software.MachineLifecycleEffectorTasksTest; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.MachineLocation; + import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.SimulatedLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java index 65d9037..485b287 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java @@ -32,6 +32,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; import org.testng.annotations.AfterMethod; @@ -39,9 +40,10 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.trait.Startable; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.BrooklynNetworkUtils; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSubclassTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSubclassTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSubclassTest.java index 388d78d..3c5784e 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSubclassTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSubclassTest.java @@ -25,6 +25,7 @@ import java.util.List; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.location.Location; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -32,7 +33,6 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.effector.EffectorAndBody; -import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java index 0bd1b09..8b516ad 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -32,7 +33,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.SoftwareProcess.ChildStartableMode; -import org.apache.brooklyn.location.Location; import brooklyn.util.ResourceUtils; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java index 52929a9..5ab4228 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,8 +34,9 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.BrooklynTaskTags.WrappedStream; -import org.apache.brooklyn.location.NoMachinesAvailableException; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; + import brooklyn.util.collections.MutableMap; import brooklyn.util.repeat.Repeater; import brooklyn.util.task.BasicExecutionContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java index c5efb0e..108e9d5 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,9 +41,10 @@ import brooklyn.entity.basic.SoftwareProcessEntityTest.MyServiceImpl; import brooklyn.entity.trait.Startable; import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.function.FunctionPollConfig; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.time.Duration; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java index d07cc89..7b3c8ea 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java @@ -25,6 +25,7 @@ import java.util.List; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; import org.testng.annotations.AfterMethod; @@ -37,8 +38,9 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.trait.Startable; import brooklyn.event.feed.ConfigToAttributes; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java index 4268998..749a9cb 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java @@ -21,6 +21,7 @@ package brooklyn.entity.brooklynnode; import java.util.Collection; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.location.Location; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractEntity; @@ -29,7 +30,6 @@ import brooklyn.entity.brooklynnode.CallbackEntityHttpClient.Request; import brooklyn.entity.brooklynnode.effector.SetHighAvailabilityModeEffectorBody; import brooklyn.entity.brooklynnode.effector.SetHighAvailabilityPriorityEffectorBody; import brooklyn.event.basic.BasicAttributeSensor; -import org.apache.brooklyn.location.Location; import com.google.common.base.Function; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/brooklynnode/SameBrooklynNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/SameBrooklynNodeImpl.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/SameBrooklynNodeImpl.java index 8aae8a2..565dffb 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/SameBrooklynNodeImpl.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/SameBrooklynNodeImpl.java @@ -26,7 +26,8 @@ import brooklyn.entity.brooklynnode.BrooklynNodeImpl.DeployBlueprintEffectorBody import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.event.feed.http.HttpValueFunctions; -import org.apache.brooklyn.location.Location; + +import org.apache.brooklyn.api.location.Location; /** Implementation of BrooklynNode which just presents the node where this is running, for convenience; * http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java b/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java index 50176e0..a04d9fa 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java +++ b/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java @@ -22,6 +22,8 @@ import java.io.File; import java.io.IOException; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,9 +31,9 @@ import org.testng.annotations.BeforeMethod; import brooklyn.entity.BrooklynAppLiveTestSupport; import brooklyn.entity.basic.EntityInternal; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.MachineProvisioningLocation; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.ResourceUtils; import brooklyn.util.io.FileUtil; import brooklyn.util.stream.InputStreamSupplier; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/chef/mysql/AbstractChefToyMySqlEntityLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/mysql/AbstractChefToyMySqlEntityLiveTest.java b/software/base/src/test/java/brooklyn/entity/chef/mysql/AbstractChefToyMySqlEntityLiveTest.java index 23a6255..92bb587 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/mysql/AbstractChefToyMySqlEntityLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/chef/mysql/AbstractChefToyMySqlEntityLiveTest.java @@ -22,7 +22,8 @@ import org.testng.annotations.Test; import brooklyn.entity.chef.ChefLiveTestSupport; import brooklyn.entity.software.mysql.AbstractToyMySqlEntityTest; -import org.apache.brooklyn.location.MachineProvisioningLocation; + +import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; public abstract class AbstractChefToyMySqlEntityLiveTest extends AbstractToyMySqlEntityTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/driver/MockSshDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/driver/MockSshDriver.java b/software/base/src/test/java/brooklyn/entity/driver/MockSshDriver.java index 42d7429..adfde4f 100644 --- a/software/base/src/test/java/brooklyn/entity/driver/MockSshDriver.java +++ b/software/base/src/test/java/brooklyn/entity/driver/MockSshDriver.java @@ -19,9 +19,10 @@ package brooklyn.entity.driver; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.location.Location; import brooklyn.entity.basic.SoftwareProcessDriver; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.SshMachineLocation; public class MockSshDriver implements SoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java b/software/base/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java index c9e85f4..02e63da 100644 --- a/software/base/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java +++ b/software/base/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java @@ -26,6 +26,10 @@ import java.util.List; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -33,12 +37,10 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.basic.SoftwareProcess; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.MachineProvisioningLocation; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.MultiLocation; + import brooklyn.test.Asserts; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java b/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java index 8505ba7..2a791fd 100644 --- a/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java @@ -22,6 +22,7 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -36,8 +37,9 @@ import brooklyn.entity.java.UsesJmx.JmxAgentModes; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.feed.jmx.JmxAttributePollConfig; import brooklyn.event.feed.jmx.JmxFeed; -import org.apache.brooklyn.location.MachineLocation; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.test.JmxService; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java b/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java index 1896ed5..b7034e0 100644 --- a/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java @@ -29,6 +29,8 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineLocation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -36,9 +38,9 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.MachineLocation; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java index ec825ec..101223e 100644 --- a/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java @@ -24,6 +24,8 @@ import static org.testng.Assert.assertTrue; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,9 +37,9 @@ import brooklyn.entity.BrooklynAppLiveTestSupport; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.basic.lifecycle.MyEntity; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.MachineProvisioningLocation; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/machine/MachineEntityEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/machine/MachineEntityEc2LiveTest.java b/software/base/src/test/java/brooklyn/entity/machine/MachineEntityEc2LiveTest.java index 344f8f3..c33e4f9 100644 --- a/software/base/src/test/java/brooklyn/entity/machine/MachineEntityEc2LiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/machine/MachineEntityEc2LiveTest.java @@ -22,12 +22,12 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; import brooklyn.entity.AbstractEc2LiveTest; -import org.apache.brooklyn.location.Location; import brooklyn.test.Asserts; public class MachineEntityEc2LiveTest extends AbstractEc2LiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java b/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java index 0996b88..db5da66 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java @@ -23,6 +23,9 @@ import static org.testng.Assert.fail; import java.util.List; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; @@ -35,10 +38,9 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.NoMachinesAvailableException; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; + import brooklyn.util.exceptions.Exceptions; import com.google.common.collect.ImmutableList;
