You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/08/14 05:43:21 UTC
[52/54] incubator-brooklyn git commit: [BROOKLYN-162] Move
./api/location to the right package
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/basic/DataEntityImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/DataEntityImpl.java b/core/src/main/java/brooklyn/entity/basic/DataEntityImpl.java
index 52ba52e..bd33a17 100644
--- a/core/src/main/java/brooklyn/entity/basic/DataEntityImpl.java
+++ b/core/src/main/java/brooklyn/entity/basic/DataEntityImpl.java
@@ -22,10 +22,10 @@ import java.util.Collection;
import java.util.Map;
import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.location.Location;
import brooklyn.event.feed.function.FunctionFeed;
import brooklyn.event.feed.function.FunctionPollConfig;
-import org.apache.brooklyn.location.Location;
import com.google.common.base.Functions;
import com.google.common.base.Supplier;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/basic/EffectorStartableImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EffectorStartableImpl.java b/core/src/main/java/brooklyn/entity/basic/EffectorStartableImpl.java
index 1bbb4c1..0abb90c 100644
--- a/core/src/main/java/brooklyn/entity/basic/EffectorStartableImpl.java
+++ b/core/src/main/java/brooklyn/entity/basic/EffectorStartableImpl.java
@@ -27,7 +27,9 @@ import brooklyn.config.ConfigKey;
import brooklyn.entity.annotation.Effector;
import brooklyn.entity.annotation.EffectorParam;
import brooklyn.entity.trait.Startable;
-import org.apache.brooklyn.location.Location;
+
+import org.apache.brooklyn.api.location.Location;
+
import brooklyn.util.config.ConfigBag;
import com.google.common.reflect.TypeToken;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/basic/Entities.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/Entities.java b/core/src/main/java/brooklyn/entity/basic/Entities.java
index c1cac26..45be84b 100644
--- a/core/src/main/java/brooklyn/entity/basic/Entities.java
+++ b/core/src/main/java/brooklyn/entity/basic/Entities.java
@@ -49,6 +49,8 @@ import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver;
import org.apache.brooklyn.api.entity.proxying.EntitySpec;
import org.apache.brooklyn.api.event.AttributeSensor;
import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.location.LocationSpec;
import org.apache.brooklyn.api.management.ExecutionContext;
import org.apache.brooklyn.api.management.LocationManager;
import org.apache.brooklyn.api.management.ManagementContext;
@@ -69,10 +71,10 @@ import brooklyn.entity.proxying.EntityProxyImpl;
import brooklyn.entity.trait.Startable;
import brooklyn.entity.trait.StartableMethods;
import brooklyn.event.basic.DependentConfiguration;
-import org.apache.brooklyn.location.Location;
-import org.apache.brooklyn.location.LocationSpec;
+
import org.apache.brooklyn.location.basic.LocationInternal;
import org.apache.brooklyn.location.basic.Locations;
+
import brooklyn.management.internal.EffectorUtils;
import brooklyn.management.internal.EntityManagerInternal;
import brooklyn.management.internal.LocalManagementContext;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/basic/EntityFactoryForLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityFactoryForLocation.java b/core/src/main/java/brooklyn/entity/basic/EntityFactoryForLocation.java
index eb7ef3a..c4dfa44 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityFactoryForLocation.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityFactoryForLocation.java
@@ -19,8 +19,7 @@
package brooklyn.entity.basic;
import org.apache.brooklyn.api.entity.Entity;
-
-import org.apache.brooklyn.location.Location;
+import org.apache.brooklyn.api.location.Location;
/**
* dispatch interface to allow an EntityFactory to indicate it might be able to discover
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java b/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java
index 1250d40..4e02948 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java
@@ -28,10 +28,10 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
import org.apache.brooklyn.api.entity.trait.Identifiable;
import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.ManagementContext;
import brooklyn.config.ConfigKey;
-import org.apache.brooklyn.location.Location;
import brooklyn.util.flags.TypeCoercions;
import brooklyn.util.guava.Functionals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
index 08c3e19..3a8b22b 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
@@ -27,6 +27,7 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal;
import org.apache.brooklyn.api.entity.rebind.RebindSupport;
import org.apache.brooklyn.api.entity.rebind.Rebindable;
import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.ExecutionContext;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.management.SubscriptionContext;
@@ -34,7 +35,6 @@ import org.apache.brooklyn.mementos.EntityMemento;
import brooklyn.basic.BrooklynObjectInternal;
import brooklyn.config.ConfigKey;
-import org.apache.brooklyn.location.Location;
import brooklyn.management.internal.EntityManagementSupport;
import brooklyn.util.config.ConfigBag;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java b/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java
index 7c7d2f3..892afc7 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java
@@ -26,10 +26,10 @@ import javax.annotation.Nullable;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.location.Location;
import brooklyn.config.ConfigKey;
import brooklyn.config.ConfigKey.HasConfigKey;
-import org.apache.brooklyn.location.Location;
import brooklyn.util.collections.CollectionFunctionals;
import brooklyn.util.guava.SerializablePredicate;
import brooklyn.util.javalang.Reflections;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java b/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java
index 70a1667..1f60c41 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java
@@ -31,6 +31,7 @@ import org.apache.brooklyn.api.entity.EntityType;
import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.entity.rebind.RebindSupport;
import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.ExecutionContext;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.mementos.EntityMemento;
@@ -41,7 +42,6 @@ import brooklyn.config.ConfigKey;
import brooklyn.config.ConfigKey.HasConfigKey;
import brooklyn.entity.basic.EntityInternal.FeedSupport;
import brooklyn.entity.proxying.EntityProxyImpl;
-import org.apache.brooklyn.location.Location;
import brooklyn.management.internal.EntityManagementSupport;
import brooklyn.util.config.ConfigBag;
import brooklyn.util.guava.Maybe;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/basic/Lifecycle.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/Lifecycle.java b/core/src/main/java/brooklyn/entity/basic/Lifecycle.java
index 75b32b4..9bb0177 100644
--- a/core/src/main/java/brooklyn/entity/basic/Lifecycle.java
+++ b/core/src/main/java/brooklyn/entity/basic/Lifecycle.java
@@ -31,7 +31,8 @@ import com.google.common.base.CaseFormat;
import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
-import org.apache.brooklyn.location.Location;
+
+import org.apache.brooklyn.api.location.Location;
/**
* An enumeration representing the status of an {@link org.apache.brooklyn.api.entity.Entity}.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/drivers/BasicEntityDriverManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/drivers/BasicEntityDriverManager.java b/core/src/main/java/brooklyn/entity/drivers/BasicEntityDriverManager.java
index 889a05a..afdce06 100644
--- a/core/src/main/java/brooklyn/entity/drivers/BasicEntityDriverManager.java
+++ b/core/src/main/java/brooklyn/entity/drivers/BasicEntityDriverManager.java
@@ -21,11 +21,10 @@ package brooklyn.entity.drivers;
import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity;
import org.apache.brooklyn.api.entity.drivers.EntityDriver;
import org.apache.brooklyn.api.entity.drivers.EntityDriverManager;
+import org.apache.brooklyn.api.location.Location;
import com.google.common.annotations.Beta;
-import org.apache.brooklyn.location.Location;
-
public class BasicEntityDriverManager implements EntityDriverManager {
private final RegistryEntityDriverFactory registry;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactory.java b/core/src/main/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactory.java
index 86591b3..0def1c9 100644
--- a/core/src/main/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactory.java
+++ b/core/src/main/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactory.java
@@ -25,13 +25,13 @@ import java.util.Map;
import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity;
import org.apache.brooklyn.api.entity.drivers.EntityDriver;
+import org.apache.brooklyn.api.location.Location;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-import org.apache.brooklyn.location.Location;
import org.apache.brooklyn.location.basic.SshMachineLocation;
import org.apache.brooklyn.location.paas.PaasLocation;
import org.apache.brooklyn.location.basic.WinRmMachineLocation;
+
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/core/src/main/java/brooklyn/entity/drivers/RegistryEntityDriverFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/drivers/RegistryEntityDriverFactory.java b/core/src/main/java/brooklyn/entity/drivers/RegistryEntityDriverFactory.java
index 2c1243f..abbc2a6 100644
--- a/core/src/main/java/brooklyn/entity/drivers/RegistryEntityDriverFactory.java
+++ b/core/src/main/java/brooklyn/entity/drivers/RegistryEntityDriverFactory.java
@@ -29,8 +29,7 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity;
import org.apache.brooklyn.api.entity.drivers.EntityDriver;
import org.apache.brooklyn.api.entity.drivers.EntityDriverManager;
-
-import org.apache.brooklyn.location.Location;
+import org.apache.brooklyn.api.location.Location;
import com.google.common.base.Objects;
import com.google.common.base.Throwables;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/group/DynamicCluster.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/group/DynamicCluster.java b/core/src/main/java/brooklyn/entity/group/DynamicCluster.java
index e6f31de..ab14f49 100644
--- a/core/src/main/java/brooklyn/entity/group/DynamicCluster.java
+++ b/core/src/main/java/brooklyn/entity/group/DynamicCluster.java
@@ -28,6 +28,7 @@ import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.entity.proxying.EntitySpec;
import org.apache.brooklyn.api.entity.proxying.ImplementedBy;
import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.location.Location;
import brooklyn.config.ConfigKey;
import brooklyn.entity.annotation.Effector;
@@ -45,7 +46,6 @@ import brooklyn.entity.trait.MemberReplaceable;
import brooklyn.event.basic.BasicAttributeSensor;
import brooklyn.event.basic.BasicNotificationSensor;
import brooklyn.event.basic.Sensors;
-import org.apache.brooklyn.location.Location;
import brooklyn.util.flags.SetFromFlag;
import brooklyn.util.time.Duration;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java b/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java
index eafb161..ba487de 100644
--- a/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java
+++ b/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java
@@ -34,6 +34,8 @@ import javax.annotation.Nullable;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
import org.apache.brooklyn.api.entity.proxying.EntitySpec;
+import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.location.MachineProvisioningLocation;
import org.apache.brooklyn.api.management.Task;
import org.apache.brooklyn.policy.Policy;
import org.slf4j.Logger;
@@ -52,10 +54,10 @@ import brooklyn.entity.basic.ServiceStateLogic.ServiceProblemsLogic;
import brooklyn.entity.effector.Effectors;
import brooklyn.entity.trait.Startable;
import brooklyn.entity.trait.StartableMethods;
-import org.apache.brooklyn.location.Location;
-import org.apache.brooklyn.location.MachineProvisioningLocation;
+
import org.apache.brooklyn.location.basic.Locations;
import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension;
+
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/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java b/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java
index 60f437e..da31efd 100644
--- a/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java
+++ b/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java
@@ -30,6 +30,7 @@ import java.util.concurrent.ExecutionException;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
import org.apache.brooklyn.api.entity.proxying.EntitySpec;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.Task;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,7 +46,6 @@ import brooklyn.entity.basic.ServiceStateLogic;
import brooklyn.entity.effector.Effectors;
import brooklyn.entity.trait.Changeable;
import brooklyn.entity.trait.Startable;
-import org.apache.brooklyn.location.Location;
import brooklyn.util.GroovyJavaMethods;
import brooklyn.util.collections.MutableList;
import brooklyn.util.exceptions.Exceptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabricImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabricImpl.java b/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabricImpl.java
index eeab8e2..c3d3ac7 100644
--- a/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabricImpl.java
+++ b/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabricImpl.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
import java.util.Collection;
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;
@@ -29,7 +30,6 @@ import org.slf4j.LoggerFactory;
import brooklyn.entity.basic.Entities;
import brooklyn.entity.basic.EntityInternal;
import brooklyn.entity.trait.Startable;
-import org.apache.brooklyn.location.Location;
import brooklyn.util.exceptions.Exceptions;
import com.google.common.base.Preconditions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/group/zoneaware/AbstractZoneFailureDetector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/group/zoneaware/AbstractZoneFailureDetector.java b/core/src/main/java/brooklyn/entity/group/zoneaware/AbstractZoneFailureDetector.java
index 62b07eb..02e87cf 100644
--- a/core/src/main/java/brooklyn/entity/group/zoneaware/AbstractZoneFailureDetector.java
+++ b/core/src/main/java/brooklyn/entity/group/zoneaware/AbstractZoneFailureDetector.java
@@ -24,9 +24,9 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.location.Location;
import brooklyn.entity.group.DynamicCluster.ZoneFailureDetector;
-import org.apache.brooklyn.location.Location;
import com.google.common.annotations.Beta;
import com.google.common.base.Ticker;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategy.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategy.java b/core/src/main/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategy.java
index 700b0b5..35b580b 100644
--- a/core/src/main/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategy.java
+++ b/core/src/main/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategy.java
@@ -25,12 +25,12 @@ import java.util.List;
import java.util.Map;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.location.Location;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.entity.group.DynamicCluster.NodePlacementStrategy;
import brooklyn.entity.trait.Startable;
-import org.apache.brooklyn.location.Location;
import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/group/zoneaware/CombiningZoneFailureDetector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/group/zoneaware/CombiningZoneFailureDetector.java b/core/src/main/java/brooklyn/entity/group/zoneaware/CombiningZoneFailureDetector.java
index b7ea052..3db3e2a 100644
--- a/core/src/main/java/brooklyn/entity/group/zoneaware/CombiningZoneFailureDetector.java
+++ b/core/src/main/java/brooklyn/entity/group/zoneaware/CombiningZoneFailureDetector.java
@@ -21,9 +21,9 @@ package brooklyn.entity.group.zoneaware;
import java.util.List;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.location.Location;
import brooklyn.entity.group.DynamicCluster.ZoneFailureDetector;
-import org.apache.brooklyn.location.Location;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/group/zoneaware/CriticalCauseZoneFailureDetector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/group/zoneaware/CriticalCauseZoneFailureDetector.java b/core/src/main/java/brooklyn/entity/group/zoneaware/CriticalCauseZoneFailureDetector.java
index ecdf73f..7b2a167 100644
--- a/core/src/main/java/brooklyn/entity/group/zoneaware/CriticalCauseZoneFailureDetector.java
+++ b/core/src/main/java/brooklyn/entity/group/zoneaware/CriticalCauseZoneFailureDetector.java
@@ -18,7 +18,8 @@
*/
package brooklyn.entity.group.zoneaware;
-import org.apache.brooklyn.location.Location;
+import org.apache.brooklyn.api.location.Location;
+
import brooklyn.util.time.Duration;
import com.google.common.base.Predicate;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetector.java b/core/src/main/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetector.java
index 13a9ed0..d3dc284 100644
--- a/core/src/main/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetector.java
+++ b/core/src/main/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetector.java
@@ -18,7 +18,8 @@
*/
package brooklyn.entity.group.zoneaware;
-import org.apache.brooklyn.location.Location;
+import org.apache.brooklyn.api.location.Location;
+
import brooklyn.util.time.Duration;
import com.google.common.base.Ticker;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java b/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java
index f44602f..58c7dfc 100644
--- a/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java
+++ b/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java
@@ -22,13 +22,15 @@ import java.lang.reflect.InvocationTargetException;
import java.util.Map;
import java.util.Map.Entry;
+import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.location.LocationSpec;
import org.apache.brooklyn.api.management.ManagementContext;
import brooklyn.config.ConfigKey;
-import org.apache.brooklyn.location.Location;
-import org.apache.brooklyn.location.LocationSpec;
+
import org.apache.brooklyn.location.basic.AbstractLocation;
import org.apache.brooklyn.location.basic.LocationInternal;
+
import brooklyn.management.internal.LocalLocationManager;
import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.config.ConfigBag;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java
index 29aa938..4fd14d8 100644
--- a/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java
+++ b/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java
@@ -29,6 +29,7 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal;
import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType;
import org.apache.brooklyn.api.entity.rebind.RebindContext;
import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.mementos.EntityMemento;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +41,6 @@ import brooklyn.entity.basic.AbstractGroupImpl;
import brooklyn.entity.basic.EntityInternal;
import brooklyn.entity.rebind.dto.MementosGenerators;
import brooklyn.event.feed.AbstractFeed;
-import org.apache.brooklyn.location.Location;
import brooklyn.policy.basic.AbstractPolicy;
import brooklyn.util.exceptions.Exceptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java
index 1719eff..75cf659 100644
--- a/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java
+++ b/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java
@@ -24,14 +24,16 @@ import java.util.Map;
import java.util.NoSuchElementException;
import org.apache.brooklyn.api.entity.rebind.RebindContext;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.mementos.LocationMemento;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.ConfigKey;
import brooklyn.entity.rebind.dto.MementosGenerators;
-import org.apache.brooklyn.location.Location;
+
import org.apache.brooklyn.location.basic.AbstractLocation;
+
import brooklyn.util.collections.MutableMap;
import brooklyn.util.flags.FlagUtils;
import brooklyn.util.flags.TypeCoercions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java b/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java
index d92fa72..f830261 100644
--- a/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java
+++ b/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java
@@ -28,6 +28,7 @@ import org.apache.brooklyn.api.catalog.CatalogItem;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.rebind.ChangeListener;
import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.mementos.BrooklynMementoPersister;
import org.apache.brooklyn.mementos.CatalogItemMemento;
import org.apache.brooklyn.mementos.EnricherMemento;
@@ -37,8 +38,6 @@ import org.apache.brooklyn.mementos.Memento;
import org.apache.brooklyn.mementos.PolicyMemento;
import org.apache.brooklyn.policy.Enricher;
import org.apache.brooklyn.policy.Policy;
-
-import org.apache.brooklyn.location.Location;
import org.apache.brooklyn.location.basic.LocationInternal;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java b/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java
index 538eaf4..0eb1993 100644
--- a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java
+++ b/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java
@@ -39,6 +39,7 @@ import org.apache.brooklyn.api.entity.Feed;
import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType;
import org.apache.brooklyn.api.entity.rebind.ChangeListener;
import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.ExecutionContext;
import org.apache.brooklyn.api.management.Task;
import org.apache.brooklyn.mementos.BrooklynMementoPersister;
@@ -50,7 +51,6 @@ import brooklyn.entity.basic.EntityInternal;
import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils;
import brooklyn.entity.rebind.persister.PersistenceActivityMetrics;
import brooklyn.internal.BrooklynFeatureEnablement;
-import org.apache.brooklyn.location.Location;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.collections.MutableSet;
import brooklyn.util.exceptions.Exceptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java b/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java
index 4e0f887..745f030 100644
--- a/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java
+++ b/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java
@@ -29,12 +29,12 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.Feed;
import org.apache.brooklyn.api.entity.rebind.RebindContext;
import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext;
import org.apache.brooklyn.policy.Enricher;
import org.apache.brooklyn.policy.Policy;
-import org.apache.brooklyn.location.Location;
import brooklyn.util.collections.MutableMap;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java b/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java
index f093089..8cd6e54 100644
--- a/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java
+++ b/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java
@@ -29,13 +29,13 @@ import org.apache.brooklyn.api.entity.Feed;
import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType;
import org.apache.brooklyn.api.entity.rebind.RebindContext;
import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext;
import org.apache.brooklyn.policy.Enricher;
import org.apache.brooklyn.policy.Policy;
import brooklyn.catalog.internal.CatalogUtils;
-import org.apache.brooklyn.location.Location;
/** Looks in {@link RebindContext} <i>and</i> {@link ManagementContext} to find entities, locations, etc. */
public class RebindContextLookupContext implements LookupContext {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java b/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java
index f08eb01..51b94ec 100644
--- a/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java
+++ b/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java
@@ -36,10 +36,10 @@ import org.apache.brooklyn.api.entity.rebind.RebindContext;
import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler;
import org.apache.brooklyn.api.entity.rebind.RebindManager;
import org.apache.brooklyn.api.entity.rebind.RebindManager.RebindFailureMode;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.policy.Enricher;
import org.apache.brooklyn.policy.Policy;
-import org.apache.brooklyn.location.Location;
import brooklyn.util.collections.MutableList;
import brooklyn.util.collections.QuorumCheck;
import brooklyn.util.exceptions.Exceptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java
index d27ea65..45f1457 100644
--- a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java
+++ b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java
@@ -46,6 +46,7 @@ import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType;
import org.apache.brooklyn.api.entity.rebind.RebindContext;
import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler;
import org.apache.brooklyn.api.entity.rebind.RebindSupport;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext;
import org.apache.brooklyn.api.management.ha.ManagementNodeState;
import org.apache.brooklyn.mementos.BrooklynMemento;
@@ -80,9 +81,10 @@ import brooklyn.entity.rebind.RebindManagerImpl.RebindTracker;
import brooklyn.entity.rebind.persister.PersistenceActivityMetrics;
import brooklyn.event.feed.AbstractFeed;
import brooklyn.internal.BrooklynFeatureEnablement;
-import org.apache.brooklyn.location.Location;
+
import org.apache.brooklyn.location.basic.AbstractLocation;
import org.apache.brooklyn.location.basic.LocationInternal;
+
import brooklyn.management.internal.BrooklynObjectManagementMode;
import brooklyn.management.internal.BrooklynObjectManagerInternal;
import brooklyn.management.internal.EntityManagerInternal;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/rebind/TreeUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/TreeUtils.java b/core/src/main/java/brooklyn/entity/rebind/TreeUtils.java
index 983bb45..a48672a 100644
--- a/core/src/main/java/brooklyn/entity/rebind/TreeUtils.java
+++ b/core/src/main/java/brooklyn/entity/rebind/TreeUtils.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.Deque;
import java.util.Set;
-import org.apache.brooklyn.location.Location;
+import org.apache.brooklyn.api.location.Location;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java
index 1a5ae1f..5a8d146 100644
--- a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java
+++ b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java
@@ -35,6 +35,7 @@ import org.apache.brooklyn.api.entity.Feed;
import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.event.AttributeSensor;
import org.apache.brooklyn.api.event.AttributeSensor.SensorPersistenceMode;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.management.Task;
import org.apache.brooklyn.mementos.BrooklynMemento;
@@ -58,8 +59,9 @@ import brooklyn.entity.rebind.AbstractBrooklynObjectRebindSupport;
import brooklyn.entity.rebind.TreeUtils;
import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils;
import brooklyn.event.feed.AbstractFeed;
-import org.apache.brooklyn.location.Location;
+
import org.apache.brooklyn.location.basic.LocationInternal;
+
import brooklyn.policy.basic.AbstractPolicy;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.config.ConfigBag;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java
index c874060..a424a31 100644
--- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java
+++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java
@@ -31,6 +31,8 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.Feed;
import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType;
import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler;
+import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.location.LocationSpec;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.management.ha.HighAvailabilityMode;
import org.apache.brooklyn.api.management.ha.ManagementNodeState;
@@ -48,9 +50,9 @@ import brooklyn.entity.basic.EntityInternal;
import brooklyn.entity.rebind.PersistenceExceptionHandlerImpl;
import brooklyn.entity.rebind.transformer.CompoundTransformer;
import brooklyn.entity.rebind.transformer.CompoundTransformerLoader;
-import org.apache.brooklyn.location.Location;
-import org.apache.brooklyn.location.LocationSpec;
+
import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation;
+
import brooklyn.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore;
import brooklyn.management.internal.LocalLocationManager;
import brooklyn.management.internal.ManagementContextInternal;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java b/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java
index c936526..fe7e26f 100644
--- a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java
+++ b/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java
@@ -35,6 +35,7 @@ import org.apache.brooklyn.api.entity.Effector;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.Feed;
import org.apache.brooklyn.api.entity.trait.Identifiable;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.management.Task;
import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext;
@@ -57,7 +58,6 @@ import brooklyn.entity.rebind.dto.BasicPolicyMemento;
import brooklyn.entity.rebind.dto.MutableBrooklynMemento;
import brooklyn.event.basic.BasicAttributeSensor;
import brooklyn.event.basic.BasicConfigKey;
-import org.apache.brooklyn.location.Location;
import brooklyn.management.classloading.BrooklynClassLoadingContextSequential;
import brooklyn.management.classloading.ClassLoaderFromBrooklynClassLoadingContext;
import brooklyn.management.classloading.JavaBrooklynClassLoadingContext;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/trait/Startable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/trait/Startable.java b/core/src/main/java/brooklyn/entity/trait/Startable.java
index 97674eb..19c7f9d 100644
--- a/core/src/main/java/brooklyn/entity/trait/Startable.java
+++ b/core/src/main/java/brooklyn/entity/trait/Startable.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import org.apache.brooklyn.api.entity.Effector;
import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.location.Location;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,7 +33,6 @@ import brooklyn.entity.basic.ConfigKeys;
import brooklyn.entity.basic.MethodEffector;
import brooklyn.entity.effector.EffectorBody;
import brooklyn.entity.effector.Effectors;
-import org.apache.brooklyn.location.Location;
import brooklyn.util.config.ConfigBag;
import brooklyn.util.task.Tasks;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/entity/trait/StartableMethods.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/trait/StartableMethods.java b/core/src/main/java/brooklyn/entity/trait/StartableMethods.java
index acfbde3..6188d14 100644
--- a/core/src/main/java/brooklyn/entity/trait/StartableMethods.java
+++ b/core/src/main/java/brooklyn/entity/trait/StartableMethods.java
@@ -24,6 +24,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.location.Location;
import org.apache.brooklyn.api.management.TaskAdaptable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,7 +32,6 @@ import org.slf4j.LoggerFactory;
import brooklyn.entity.basic.Entities;
import brooklyn.entity.basic.EntityPredicates;
import brooklyn.entity.effector.Effectors;
-import org.apache.brooklyn.location.Location;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.config.ConfigBag;
import brooklyn.util.exceptions.CompoundRuntimeException;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java b/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java
index ccfcc63..b086b98 100644
--- a/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java
+++ b/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java
@@ -23,6 +23,10 @@ import java.util.Iterator;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.location.MachineProvisioningLocation;
+import org.apache.brooklyn.api.location.PortRange;
+import org.apache.brooklyn.api.location.PortSupplier;
import org.apache.brooklyn.api.management.ManagementContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,11 +34,9 @@ import org.slf4j.LoggerFactory;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.BrooklynConfigKeys;
import brooklyn.internal.BrooklynInitialization;
-import org.apache.brooklyn.location.Location;
-import org.apache.brooklyn.location.MachineProvisioningLocation;
-import org.apache.brooklyn.location.PortRange;
-import org.apache.brooklyn.location.PortSupplier;
+
import org.apache.brooklyn.location.basic.Locations;
+
import brooklyn.util.flags.TypeCoercions;
import brooklyn.util.guava.Maybe;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java b/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java
index b933e6b..c4489fe 100644
--- a/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java
+++ b/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java
@@ -32,6 +32,7 @@ import javax.annotation.Nullable;
import org.apache.brooklyn.api.entity.Application;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.rebind.RebindManager;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.Task;
import org.apache.brooklyn.api.management.ha.HighAvailabilityManager;
import org.apache.brooklyn.api.management.ha.HighAvailabilityMode;
@@ -60,7 +61,6 @@ import brooklyn.entity.rebind.plane.dto.BasicManagementNodeSyncRecord;
import brooklyn.entity.rebind.plane.dto.ManagementPlaneSyncRecordImpl;
import brooklyn.entity.rebind.plane.dto.ManagementPlaneSyncRecordImpl.Builder;
import brooklyn.internal.BrooklynFeatureEnablement;
-import org.apache.brooklyn.location.Location;
import brooklyn.management.ha.BasicMasterChooser.AlphabeticMasterChooser;
import brooklyn.management.internal.BrooklynObjectManagementMode;
import brooklyn.management.internal.LocalEntityManager;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java b/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java
index 4c790b6..5e7f4a6 100644
--- a/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java
+++ b/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java
@@ -42,6 +42,7 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.drivers.EntityDriverManager;
import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager;
import org.apache.brooklyn.api.entity.rebind.RebindManager;
+import org.apache.brooklyn.api.location.LocationRegistry;
import org.apache.brooklyn.api.management.ExecutionContext;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.management.SubscriptionContext;
@@ -66,8 +67,9 @@ import brooklyn.internal.storage.DataGrid;
import brooklyn.internal.storage.DataGridFactory;
import brooklyn.internal.storage.impl.BrooklynStorageImpl;
import brooklyn.internal.storage.impl.inmemory.InMemoryDataGridFactory;
-import org.apache.brooklyn.location.LocationRegistry;
+
import org.apache.brooklyn.location.basic.BasicLocationRegistry;
+
import brooklyn.management.classloading.JavaBrooklynClassLoadingContext;
import brooklyn.management.entitlement.Entitlements;
import brooklyn.management.ha.HighAvailabilityManagerImpl;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/management/internal/BrooklynGarbageCollector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/BrooklynGarbageCollector.java b/core/src/main/java/brooklyn/management/internal/BrooklynGarbageCollector.java
index 5bb6eac..0c54909 100644
--- a/core/src/main/java/brooklyn/management/internal/BrooklynGarbageCollector.java
+++ b/core/src/main/java/brooklyn/management/internal/BrooklynGarbageCollector.java
@@ -36,6 +36,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.HasTaskChildren;
import org.apache.brooklyn.api.management.Task;
import org.slf4j.Logger;
@@ -49,7 +50,6 @@ import brooklyn.entity.basic.BrooklynTaskTags.WrappedStream;
import brooklyn.entity.basic.ConfigKeys;
import brooklyn.entity.basic.Entities;
import brooklyn.internal.storage.BrooklynStorage;
-import org.apache.brooklyn.location.Location;
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/core/src/main/java/brooklyn/management/internal/LocalAccessManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/LocalAccessManager.java b/core/src/main/java/brooklyn/management/internal/LocalAccessManager.java
index 3874d3d..696d0f0 100644
--- a/core/src/main/java/brooklyn/management/internal/LocalAccessManager.java
+++ b/core/src/main/java/brooklyn/management/internal/LocalAccessManager.java
@@ -21,10 +21,9 @@ package brooklyn.management.internal;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.AccessController;
-import org.apache.brooklyn.location.Location;
-
import com.google.common.annotations.Beta;
@Beta
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java b/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java
index 3d6acfd..31dc036 100644
--- a/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java
+++ b/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java
@@ -25,6 +25,9 @@ import java.util.Collection;
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.location.LocationSpec;
+import org.apache.brooklyn.api.location.ProvisioningLocation;
import org.apache.brooklyn.api.management.AccessController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,11 +39,10 @@ import brooklyn.entity.basic.ConfigKeys;
import brooklyn.entity.basic.Lifecycle;
import brooklyn.entity.proxying.InternalLocationFactory;
import brooklyn.internal.storage.BrooklynStorage;
-import org.apache.brooklyn.location.Location;
-import org.apache.brooklyn.location.LocationSpec;
-import org.apache.brooklyn.location.ProvisioningLocation;
+
import org.apache.brooklyn.location.basic.AbstractLocation;
import org.apache.brooklyn.location.basic.LocationInternal;
+
import brooklyn.management.entitlement.Entitlements;
import brooklyn.util.config.ConfigBag;
import brooklyn.util.exceptions.Exceptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/management/internal/LocalManagementContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/LocalManagementContext.java b/core/src/main/java/brooklyn/management/internal/LocalManagementContext.java
index 73a362f..db9b33b 100644
--- a/core/src/main/java/brooklyn/management/internal/LocalManagementContext.java
+++ b/core/src/main/java/brooklyn/management/internal/LocalManagementContext.java
@@ -34,6 +34,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.brooklyn.api.entity.Application;
import org.apache.brooklyn.api.entity.Effector;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.AccessController;
import org.apache.brooklyn.api.management.ExecutionContext;
import org.apache.brooklyn.api.management.ExecutionManager;
@@ -53,7 +54,6 @@ import brooklyn.entity.proxying.InternalLocationFactory;
import brooklyn.entity.proxying.InternalPolicyFactory;
import brooklyn.internal.BrooklynFeatureEnablement;
import brooklyn.internal.storage.DataGridFactory;
-import org.apache.brooklyn.location.Location;
import brooklyn.management.entitlement.Entitlements;
import brooklyn.management.ha.OsgiManager;
import brooklyn.util.exceptions.Exceptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/management/internal/LocalUsageManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/LocalUsageManager.java b/core/src/main/java/brooklyn/management/internal/LocalUsageManager.java
index 31084a4..6da41c8 100644
--- a/core/src/main/java/brooklyn/management/internal/LocalUsageManager.java
+++ b/core/src/main/java/brooklyn/management/internal/LocalUsageManager.java
@@ -33,6 +33,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.brooklyn.api.entity.Application;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.entitlement.EntitlementContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,10 +42,11 @@ import brooklyn.entity.basic.Entities;
import brooklyn.entity.basic.EntityInternal;
import brooklyn.entity.basic.Lifecycle;
import brooklyn.internal.storage.BrooklynStorage;
-import org.apache.brooklyn.location.Location;
+
import org.apache.brooklyn.location.basic.AbstractLocation;
import org.apache.brooklyn.location.basic.LocationConfigKeys;
import org.apache.brooklyn.location.basic.LocationInternal;
+
import brooklyn.management.ManagementContextInjectable;
import brooklyn.management.entitlement.Entitlements;
import brooklyn.management.usage.ApplicationUsage;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/management/internal/LocationManagerInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/LocationManagerInternal.java b/core/src/main/java/brooklyn/management/internal/LocationManagerInternal.java
index 2d126bc..17ecd5a 100644
--- a/core/src/main/java/brooklyn/management/internal/LocationManagerInternal.java
+++ b/core/src/main/java/brooklyn/management/internal/LocationManagerInternal.java
@@ -18,10 +18,9 @@
*/
package brooklyn.management.internal;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.LocationManager;
-import org.apache.brooklyn.location.Location;
-
public interface LocationManagerInternal extends LocationManager, BrooklynObjectManagerInternal<Location> {
public Iterable<String> getLocationIds();
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java b/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java
index 699b34f..b21f73f 100644
--- a/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java
+++ b/core/src/main/java/brooklyn/management/internal/ManagementContextInternal.java
@@ -26,6 +26,7 @@ import java.util.concurrent.ExecutionException;
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.ManagementContext;
import org.apache.brooklyn.api.management.Task;
@@ -36,7 +37,6 @@ import brooklyn.entity.proxying.InternalEntityFactory;
import brooklyn.entity.proxying.InternalLocationFactory;
import brooklyn.entity.proxying.InternalPolicyFactory;
import brooklyn.internal.storage.BrooklynStorage;
-import org.apache.brooklyn.location.Location;
import brooklyn.management.ha.OsgiManager;
import brooklyn.util.guava.Maybe;
import brooklyn.util.task.TaskTags;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java b/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java
index eaad030..5d68db6 100644
--- a/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java
+++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentLocationManager.java
@@ -22,11 +22,10 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
+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.location.Location;
-import org.apache.brooklyn.location.LocationSpec;
-
public class NonDeploymentLocationManager implements LocationManagerInternal {
private final ManagementContext initialManagementContext;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java b/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java
index eff0417..67a9d1b 100644
--- a/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java
+++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java
@@ -42,6 +42,8 @@ import org.apache.brooklyn.api.entity.rebind.ChangeListener;
import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler;
import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler;
import org.apache.brooklyn.api.entity.rebind.RebindManager;
+import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.location.LocationRegistry;
import org.apache.brooklyn.api.management.AccessController;
import org.apache.brooklyn.api.management.EntityManager;
import org.apache.brooklyn.api.management.ExecutionContext;
@@ -66,8 +68,6 @@ import brooklyn.entity.proxying.InternalEntityFactory;
import brooklyn.entity.proxying.InternalLocationFactory;
import brooklyn.entity.proxying.InternalPolicyFactory;
import brooklyn.internal.storage.BrooklynStorage;
-import org.apache.brooklyn.location.Location;
-import org.apache.brooklyn.location.LocationRegistry;
import brooklyn.management.entitlement.Entitlements;
import brooklyn.management.ha.OsgiManager;
import brooklyn.util.guava.Maybe;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/management/internal/NonDeploymentUsageManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/NonDeploymentUsageManager.java b/core/src/main/java/brooklyn/management/internal/NonDeploymentUsageManager.java
index 55577d4..ec2cd10 100644
--- a/core/src/main/java/brooklyn/management/internal/NonDeploymentUsageManager.java
+++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentUsageManager.java
@@ -21,9 +21,9 @@ package brooklyn.management.internal;
import java.util.Set;
import org.apache.brooklyn.api.entity.Application;
+import org.apache.brooklyn.api.location.Location;
import brooklyn.entity.basic.Lifecycle;
-import org.apache.brooklyn.location.Location;
import brooklyn.management.usage.ApplicationUsage;
import brooklyn.management.usage.LocationUsage;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/management/internal/UsageListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/UsageListener.java b/core/src/main/java/brooklyn/management/internal/UsageListener.java
index 3914802..5a2af3a 100644
--- a/core/src/main/java/brooklyn/management/internal/UsageListener.java
+++ b/core/src/main/java/brooklyn/management/internal/UsageListener.java
@@ -21,8 +21,8 @@ package brooklyn.management.internal;
import java.util.Map;
import org.apache.brooklyn.api.entity.Application;
+import org.apache.brooklyn.api.location.Location;
-import org.apache.brooklyn.location.Location;
import brooklyn.management.usage.ApplicationUsage.ApplicationEvent;
import brooklyn.management.usage.LocationUsage.LocationEvent;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/management/internal/UsageManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/UsageManager.java b/core/src/main/java/brooklyn/management/internal/UsageManager.java
index bc4dfe5..5105faf 100644
--- a/core/src/main/java/brooklyn/management/internal/UsageManager.java
+++ b/core/src/main/java/brooklyn/management/internal/UsageManager.java
@@ -25,11 +25,11 @@ import java.util.Map;
import java.util.Set;
import org.apache.brooklyn.api.entity.Application;
+import org.apache.brooklyn.api.location.Location;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.ConfigKeys;
import brooklyn.entity.basic.Lifecycle;
-import org.apache.brooklyn.location.Location;
import brooklyn.management.usage.ApplicationUsage;
import brooklyn.management.usage.ApplicationUsage.ApplicationEvent;
import brooklyn.management.usage.LocationUsage;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/util/task/ssh/SshTasks.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/util/task/ssh/SshTasks.java b/core/src/main/java/brooklyn/util/task/ssh/SshTasks.java
index b13b43c..9f6fbb9 100644
--- a/core/src/main/java/brooklyn/util/task/ssh/SshTasks.java
+++ b/core/src/main/java/brooklyn/util/task/ssh/SshTasks.java
@@ -23,6 +23,7 @@ import java.util.Map;
import javax.annotation.Nullable;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.ManagementContext;
import org.apache.brooklyn.api.management.Task;
import org.apache.brooklyn.api.management.TaskAdaptable;
@@ -35,10 +36,11 @@ import brooklyn.config.ConfigKey;
import brooklyn.config.ConfigUtils;
import brooklyn.entity.basic.BrooklynTaskTags;
import brooklyn.entity.basic.ConfigKeys;
-import org.apache.brooklyn.location.Location;
+
import org.apache.brooklyn.location.basic.AbstractLocation;
import org.apache.brooklyn.location.basic.LocationInternal;
import org.apache.brooklyn.location.basic.SshMachineLocation;
+
import brooklyn.util.ResourceUtils;
import brooklyn.util.config.ConfigBag;
import brooklyn.util.internal.ssh.SshTool;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/brooklyn/util/text/TemplateProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/util/text/TemplateProcessor.java b/core/src/main/java/brooklyn/util/text/TemplateProcessor.java
index f936e93..b5d8b2d 100644
--- a/core/src/main/java/brooklyn/util/text/TemplateProcessor.java
+++ b/core/src/main/java/brooklyn/util/text/TemplateProcessor.java
@@ -28,6 +28,7 @@ import java.util.Map;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.drivers.EntityDriver;
import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.management.ManagementContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,7 +38,6 @@ import brooklyn.entity.basic.Entities;
import brooklyn.entity.basic.EntityInternal;
import brooklyn.event.basic.DependentConfiguration;
import brooklyn.event.basic.Sensors;
-import org.apache.brooklyn.location.Location;
import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.exceptions.Exceptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/access/BrooklynAccessUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/access/BrooklynAccessUtils.java b/core/src/main/java/org/apache/brooklyn/location/access/BrooklynAccessUtils.java
index eebee14..9daf1c5 100644
--- a/core/src/main/java/org/apache/brooklyn/location/access/BrooklynAccessUtils.java
+++ b/core/src/main/java/org/apache/brooklyn/location/access/BrooklynAccessUtils.java
@@ -21,17 +21,19 @@ package org.apache.brooklyn.location.access;
import java.util.Collection;
import org.apache.brooklyn.api.entity.Entity;
-import org.apache.brooklyn.location.Location;
+import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.location.MachineLocation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.Attributes;
import brooklyn.event.basic.BasicConfigKey;
-import org.apache.brooklyn.location.MachineLocation;
+
import org.apache.brooklyn.location.basic.Machines;
import org.apache.brooklyn.location.basic.SshMachineLocation;
import org.apache.brooklyn.location.basic.SupportsPortForwarding;
+
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.guava.Maybe;
import brooklyn.util.net.Cidr;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManager.java b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManager.java
index 922231b..935dff3 100644
--- a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManager.java
+++ b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManager.java
@@ -20,7 +20,9 @@ package org.apache.brooklyn.location.access;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.ConfigKeys;
-import org.apache.brooklyn.location.Location;
+
+import org.apache.brooklyn.api.location.Location;
+
import com.google.common.annotations.Beta;
import com.google.common.base.Objects;
import com.google.common.base.Predicate;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerClient.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerClient.java b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerClient.java
index 09aea72..5e2d3ca 100644
--- a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerClient.java
+++ b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerClient.java
@@ -23,10 +23,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 brooklyn.config.ConfigKey;
import brooklyn.config.ConfigKey.HasConfigKey;
-import org.apache.brooklyn.location.Location;
import brooklyn.util.exceptions.Exceptions;
import com.google.common.base.Preconditions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerImpl.java b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerImpl.java
index 6493f30..af1a496 100644
--- a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerImpl.java
+++ b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerImpl.java
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.brooklyn.api.entity.rebind.RebindContext;
import org.apache.brooklyn.api.entity.rebind.RebindSupport;
-import org.apache.brooklyn.location.Location;
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.location.basic.AbstractLocation;
import org.apache.brooklyn.mementos.LocationMemento;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolver.java
index dcb9048..db35a34 100644
--- a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolver.java
+++ b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolver.java
@@ -20,16 +20,16 @@ package org.apache.brooklyn.location.access;
import java.util.Map;
-import org.apache.brooklyn.location.Location;
-import org.apache.brooklyn.location.LocationRegistry;
-import org.apache.brooklyn.location.LocationSpec;
+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.location.basic.LocationConfigUtils;
import org.apache.brooklyn.location.basic.LocationInternal;
import org.apache.brooklyn.location.basic.LocationPredicates;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.apache.brooklyn.location.basic.AbstractLocationResolver;
+
import brooklyn.util.config.ConfigBag;
import com.google.common.base.Optional;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/access/PortMapping.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/access/PortMapping.java b/core/src/main/java/org/apache/brooklyn/location/access/PortMapping.java
index 086b67c..169cf71 100644
--- a/core/src/main/java/org/apache/brooklyn/location/access/PortMapping.java
+++ b/core/src/main/java/org/apache/brooklyn/location/access/PortMapping.java
@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import javax.annotation.Nullable;
-import org.apache.brooklyn.location.Location;
+import org.apache.brooklyn.api.location.Location;
import com.google.common.annotations.Beta;
import com.google.common.base.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocation.java
index eee375b..7280927 100644
--- a/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocation.java
@@ -31,8 +31,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.brooklyn.api.entity.rebind.RebindSupport;
import org.apache.brooklyn.api.entity.trait.Configurable;
+import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.location.LocationSpec;
import org.apache.brooklyn.api.management.Task;
-import org.apache.brooklyn.location.Location;
import org.apache.brooklyn.mementos.LocationMemento;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,9 +49,10 @@ import brooklyn.internal.BrooklynFeatureEnablement;
import brooklyn.internal.storage.BrooklynStorage;
import brooklyn.internal.storage.Reference;
import brooklyn.internal.storage.impl.BasicReference;
-import org.apache.brooklyn.location.LocationSpec;
+
import org.apache.brooklyn.location.geo.HasHostGeoInfo;
import org.apache.brooklyn.location.geo.HostGeoInfo;
+
import brooklyn.management.internal.LocalLocationManager;
import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.collections.SetFromLiveMap;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocationResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocationResolver.java
index 59a0771..26f895c 100644
--- a/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocationResolver.java
+++ b/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocationResolver.java
@@ -26,15 +26,15 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.location.LocationRegistry;
+import org.apache.brooklyn.api.location.LocationResolver;
+import org.apache.brooklyn.api.location.LocationSpec;
import org.apache.brooklyn.api.management.ManagementContext;
-import org.apache.brooklyn.location.Location;
-import org.apache.brooklyn.location.LocationRegistry;
-import org.apache.brooklyn.location.LocationResolver;
-import org.apache.brooklyn.location.LocationSpec;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.apache.brooklyn.location.basic.AbstractLocationResolver.SpecParser.ParsedSpec;
+
import brooklyn.util.collections.MutableMap;
import brooklyn.util.config.ConfigBag;
import brooklyn.util.text.KeyValueParser;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocation.java
index 33e8efa..c814209 100644
--- a/core/src/main/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocation.java
@@ -26,9 +26,10 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-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 brooklyn.util.flags.SetFromFlag;
import brooklyn.util.stream.Streams;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/BasicHardwareDetails.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/BasicHardwareDetails.java b/core/src/main/java/org/apache/brooklyn/location/basic/BasicHardwareDetails.java
index fc90a68..4393884 100644
--- a/core/src/main/java/org/apache/brooklyn/location/basic/BasicHardwareDetails.java
+++ b/core/src/main/java/org/apache/brooklyn/location/basic/BasicHardwareDetails.java
@@ -22,7 +22,7 @@ import javax.annotation.concurrent.Immutable;
import com.google.common.base.Objects;
-import org.apache.brooklyn.location.HardwareDetails;
+import org.apache.brooklyn.api.location.HardwareDetails;
@Immutable
public class BasicHardwareDetails implements HardwareDetails {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationDefinition.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationDefinition.java b/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationDefinition.java
index 550ca12..9072074 100644
--- a/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationDefinition.java
+++ b/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationDefinition.java
@@ -20,7 +20,8 @@ package org.apache.brooklyn.location.basic;
import java.util.Map;
-import org.apache.brooklyn.location.LocationDefinition;
+import org.apache.brooklyn.api.location.LocationDefinition;
+
import brooklyn.util.text.Identifiers;
import com.google.common.base.Preconditions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationRegistry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationRegistry.java b/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationRegistry.java
index 1c21e32..490335a 100644
--- a/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationRegistry.java
+++ b/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationRegistry.java
@@ -30,15 +30,15 @@ import java.util.NoSuchElementException;
import java.util.ServiceLoader;
import java.util.Set;
-import org.apache.brooklyn.location.Location;
-import org.apache.brooklyn.location.LocationDefinition;
-import org.apache.brooklyn.location.LocationRegistry;
-import org.apache.brooklyn.location.LocationResolver;
-import org.apache.brooklyn.location.LocationSpec;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.brooklyn.api.catalog.BrooklynCatalog;
import org.apache.brooklyn.api.catalog.CatalogItem;
+import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.location.LocationDefinition;
+import org.apache.brooklyn.api.location.LocationRegistry;
+import org.apache.brooklyn.api.location.LocationResolver;
+import org.apache.brooklyn.api.location.LocationSpec;
import org.apache.brooklyn.api.management.ManagementContext;
import brooklyn.catalog.CatalogPredicates;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineDetails.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineDetails.java b/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineDetails.java
index e4b4575..d6b51c6 100644
--- a/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineDetails.java
+++ b/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineDetails.java
@@ -28,13 +28,13 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.Immutable;
+import org.apache.brooklyn.api.location.HardwareDetails;
+import org.apache.brooklyn.api.location.MachineDetails;
+import org.apache.brooklyn.api.location.OsDetails;
import org.apache.brooklyn.api.management.Task;
-import org.apache.brooklyn.location.MachineDetails;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.brooklyn.location.HardwareDetails;
-import org.apache.brooklyn.location.OsDetails;
import brooklyn.util.ResourceUtils;
import brooklyn.util.stream.Streams;
import brooklyn.util.task.DynamicTasks;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineMetadata.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineMetadata.java b/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineMetadata.java
index ff1c0af..95c8f0e 100644
--- a/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineMetadata.java
+++ b/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineMetadata.java
@@ -19,7 +19,8 @@
package org.apache.brooklyn.location.basic;
import com.google.common.base.Objects;
-import org.apache.brooklyn.location.MachineManagementMixins;
+
+import org.apache.brooklyn.api.location.MachineManagementMixins;
public class BasicMachineMetadata implements MachineManagementMixins.MachineMetadata {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/BasicOsDetails.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/BasicOsDetails.java b/core/src/main/java/org/apache/brooklyn/location/basic/BasicOsDetails.java
index 364e5f3..7ab72c7 100644
--- a/core/src/main/java/org/apache/brooklyn/location/basic/BasicOsDetails.java
+++ b/core/src/main/java/org/apache/brooklyn/location/basic/BasicOsDetails.java
@@ -19,12 +19,13 @@
package org.apache.brooklyn.location.basic;
import java.util.regex.Pattern;
+
import javax.annotation.Nullable;
import javax.annotation.concurrent.Immutable;
import com.google.common.base.Objects;
-import org.apache.brooklyn.location.OsDetails;
+import org.apache.brooklyn.api.location.OsDetails;
@Immutable
public class BasicOsDetails implements OsDetails {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/ByonLocationResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/ByonLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/ByonLocationResolver.java
index a93d3dd..127a665 100644
--- a/core/src/main/java/org/apache/brooklyn/location/basic/ByonLocationResolver.java
+++ b/core/src/main/java/org/apache/brooklyn/location/basic/ByonLocationResolver.java
@@ -24,9 +24,10 @@ import java.net.InetAddress;
import java.util.List;
import java.util.Map;
-import org.apache.brooklyn.location.Location;
-import org.apache.brooklyn.location.LocationRegistry;
-import org.apache.brooklyn.location.LocationSpec;
+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.MachineLocation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,7 +40,6 @@ import com.google.common.net.HostAndPort;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.ConfigKeys;
import brooklyn.entity.basic.Sanitizer;
-import org.apache.brooklyn.location.MachineLocation;
import brooklyn.management.internal.LocalLocationManager;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.config.ConfigBag;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/CatalogLocationResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/CatalogLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/CatalogLocationResolver.java
index 7d55d57..0866649 100644
--- a/core/src/main/java/org/apache/brooklyn/location/basic/CatalogLocationResolver.java
+++ b/core/src/main/java/org/apache/brooklyn/location/basic/CatalogLocationResolver.java
@@ -22,13 +22,13 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
-import org.apache.brooklyn.location.Location;
-import org.apache.brooklyn.location.LocationRegistry;
-import org.apache.brooklyn.location.LocationResolver;
-import org.apache.brooklyn.location.LocationSpec;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.brooklyn.api.catalog.CatalogItem;
+import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.location.LocationRegistry;
+import org.apache.brooklyn.api.location.LocationResolver;
+import org.apache.brooklyn.api.location.LocationSpec;
import org.apache.brooklyn.api.management.ManagementContext;
import brooklyn.catalog.internal.CatalogUtils;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/DefinedLocationByIdResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/DefinedLocationByIdResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/DefinedLocationByIdResolver.java
index 7277fc9..38fef17 100644
--- a/core/src/main/java/org/apache/brooklyn/location/basic/DefinedLocationByIdResolver.java
+++ b/core/src/main/java/org/apache/brooklyn/location/basic/DefinedLocationByIdResolver.java
@@ -22,11 +22,11 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
+import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.api.location.LocationDefinition;
+import org.apache.brooklyn.api.location.LocationRegistry;
+import org.apache.brooklyn.api.location.LocationResolver;
import org.apache.brooklyn.api.management.ManagementContext;
-import org.apache.brooklyn.location.Location;
-import org.apache.brooklyn.location.LocationDefinition;
-import org.apache.brooklyn.location.LocationRegistry;
-import org.apache.brooklyn.location.LocationResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocation.java
index 45bc585..7b9d73e 100644
--- a/core/src/main/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocation.java
@@ -28,11 +28,13 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+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.MachineLocationCustomizer;
+import org.apache.brooklyn.api.location.MachineProvisioningLocation;
+import org.apache.brooklyn.api.location.NoMachinesAvailableException;
import org.apache.brooklyn.api.management.LocationManager;
-import org.apache.brooklyn.location.Location;
-import org.apache.brooklyn.location.LocationSpec;
-import org.apache.brooklyn.location.MachineLocationCustomizer;
-import org.apache.brooklyn.location.NoMachinesAvailableException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,9 +50,9 @@ import com.google.common.reflect.TypeToken;
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.cloud.CloudLocationConfig;
+
import brooklyn.util.collections.CollectionFunctionals;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.collections.MutableSet;