http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/HostLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/HostLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/HostLocationResolver.java index 0e5225b..8eb983c 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/HostLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/HostLocationResolver.java @@ -20,10 +20,11 @@ package org.apache.brooklyn.location.basic; 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.AbstractLocationResolver.SpecParser.ParsedSpec; + import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostLocationResolver.java index 47c8089..859fa99 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostLocationResolver.java @@ -20,10 +20,11 @@ package org.apache.brooklyn.location.basic; import java.util.Map; -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationRegistry; +import org.apache.brooklyn.api.location.LocationResolver; + import brooklyn.util.config.ConfigBag; -import org.apache.brooklyn.location.LocationRegistry; -import org.apache.brooklyn.location.LocationResolver; /** * Examples of valid specs: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocation.java index 44b95b6..cfaf241 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocation.java @@ -27,11 +27,11 @@ import java.util.Arrays; import java.util.Map; import java.util.Set; -import org.apache.brooklyn.location.AddressableLocation; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.MachineProvisioningLocation; -import org.apache.brooklyn.location.OsDetails; -import org.apache.brooklyn.location.PortRange; +import org.apache.brooklyn.api.location.AddressableLocation; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.api.location.OsDetails; +import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.location.geo.HostGeoInfo; 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/LocationDynamicType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocationDynamicType.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocationDynamicType.java index a289090..f13be4e 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocationDynamicType.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocationDynamicType.java @@ -19,8 +19,9 @@ package org.apache.brooklyn.location.basic; import brooklyn.basic.BrooklynDynamicType; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationType; + +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationType; public class LocationDynamicType extends BrooklynDynamicType<Location, AbstractLocation> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/LocationInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocationInternal.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocationInternal.java index 429e671..d1ffcb9 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocationInternal.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocationInternal.java @@ -21,8 +21,8 @@ package org.apache.brooklyn.location.basic; import java.util.Map; import org.apache.brooklyn.api.entity.rebind.RebindSupport; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.location.Location; import org.apache.brooklyn.mementos.LocationMemento; import brooklyn.basic.BrooklynObjectInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/LocationPredicates.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocationPredicates.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocationPredicates.java index d0b781b..fc90b38 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocationPredicates.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocationPredicates.java @@ -22,7 +22,8 @@ import javax.annotation.Nullable; import brooklyn.config.ConfigKey; import brooklyn.config.ConfigKey.HasConfigKey; -import org.apache.brooklyn.location.Location; + +import org.apache.brooklyn.api.location.Location; 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/basic/Locations.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/Locations.java b/core/src/main/java/org/apache/brooklyn/location/basic/Locations.java index 31855ed..9af45a1 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/Locations.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/Locations.java @@ -25,15 +25,15 @@ import java.util.List; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; +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.LocationManager; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.location.Location; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.MachineLocation; import brooklyn.util.collections.MutableList; import brooklyn.util.guava.Maybe; import brooklyn.util.yaml.Yamls; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/Machines.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/Machines.java b/core/src/main/java/org/apache/brooklyn/location/basic/Machines.java index 621e1e2..13f8028 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/Machines.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/Machines.java @@ -24,15 +24,17 @@ import java.util.Iterator; import java.util.Set; 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 com.google.common.collect.Iterables; import brooklyn.entity.basic.Attributes; -import org.apache.brooklyn.location.MachineLocation; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; + import brooklyn.util.guava.Maybe; import brooklyn.util.net.HasNetworkAddresses; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocation.java index bbf45f0..b702a92 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocation.java @@ -26,17 +26,17 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +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.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.NoMachinesAvailableException; import org.apache.brooklyn.location.cloud.AbstractAvailabilityZoneExtension; import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.MachineProvisioningLocation; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.CompoundRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocationResolver.java index ac4b7b3..92692ae 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocationResolver.java @@ -26,11 +26,11 @@ import java.util.Set; 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; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/NamedLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/NamedLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/NamedLocationResolver.java index 048c28c..a9f6499 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/NamedLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/NamedLocationResolver.java @@ -23,11 +23,11 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.NoSuchElementException; +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/PortRanges.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/PortRanges.java b/core/src/main/java/org/apache/brooklyn/location/basic/PortRanges.java index 6a17c1a..2e1bdcc 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/PortRanges.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/PortRanges.java @@ -29,7 +29,8 @@ import java.util.List; import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.brooklyn.location.PortRange; +import org.apache.brooklyn.api.location.PortRange; + import brooklyn.util.flags.TypeCoercions; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/RegistryLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/RegistryLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/RegistryLocationResolver.java index 06558cb..a6b82ee 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/RegistryLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/RegistryLocationResolver.java @@ -20,9 +20,9 @@ package org.apache.brooklyn.location.basic; import java.util.Map; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationResolver; -import org.apache.brooklyn.location.LocationRegistry; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationRegistry; +import org.apache.brooklyn.api.location.LocationResolver; /** * Extension to LocationResolver which can take a registry. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolver.java index 4be135f..fb5f676 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolver.java @@ -20,9 +20,10 @@ package org.apache.brooklyn.location.basic; 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 brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineProvisioningLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineProvisioningLocation.java index 6c40ba3..5f249d2 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineProvisioningLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineProvisioningLocation.java @@ -20,12 +20,12 @@ package org.apache.brooklyn.location.basic; import java.util.Map; -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.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.MachineProvisioningLocation; import brooklyn.util.flags.SetFromFlag; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/basic/SshMachineLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/SshMachineLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/SshMachineLocation.java index e83712e..0a8dd44 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/SshMachineLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/SshMachineLocation.java @@ -45,10 +45,12 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.apache.brooklyn.api.location.MachineDetails; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.OsDetails; +import org.apache.brooklyn.api.location.PortRange; +import org.apache.brooklyn.api.location.PortSupplier; import org.apache.brooklyn.api.management.Task; -import org.apache.brooklyn.location.MachineDetails; -import org.apache.brooklyn.location.OsDetails; -import org.apache.brooklyn.location.PortRange; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -82,9 +84,9 @@ import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.MapConfigKey; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.PortSupplier; + import org.apache.brooklyn.location.access.PortForwardManager; + import brooklyn.util.ResourceUtils; 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/WinRmMachineLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/WinRmMachineLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/WinRmMachineLocation.java index 3860eb5..319b9fb 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/WinRmMachineLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/WinRmMachineLocation.java @@ -33,8 +33,9 @@ import java.util.Set; import javax.annotation.Nullable; -import org.apache.brooklyn.location.MachineDetails; -import org.apache.brooklyn.location.OsDetails; +import org.apache.brooklyn.api.location.MachineDetails; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.OsDetails; import org.apache.commons.codec.binary.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,8 +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.access.PortForwardManager; + import brooklyn.util.exceptions.Exceptions; import brooklyn.util.stream.Streams; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractAvailabilityZoneExtension.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractAvailabilityZoneExtension.java b/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractAvailabilityZoneExtension.java index d399b92..9069dce 100644 --- a/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractAvailabilityZoneExtension.java +++ b/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractAvailabilityZoneExtension.java @@ -24,10 +24,9 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.location.Location; - import com.google.common.annotations.Beta; 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/org/apache/brooklyn/location/cloud/AbstractCloudMachineProvisioningLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractCloudMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractCloudMachineProvisioningLocation.java index 13707b5..437d49b 100644 --- a/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractCloudMachineProvisioningLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractCloudMachineProvisioningLocation.java @@ -21,10 +21,11 @@ package org.apache.brooklyn.location.cloud; import java.util.Collection; import java.util.Map; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.MachineProvisioningLocation; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.location.basic.AbstractLocation; + import brooklyn.util.collections.MutableMap; 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/org/apache/brooklyn/location/cloud/AvailabilityZoneExtension.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/cloud/AvailabilityZoneExtension.java b/core/src/main/java/org/apache/brooklyn/location/cloud/AvailabilityZoneExtension.java index 1580440..380fd44 100644 --- a/core/src/main/java/org/apache/brooklyn/location/cloud/AvailabilityZoneExtension.java +++ b/core/src/main/java/org/apache/brooklyn/location/cloud/AvailabilityZoneExtension.java @@ -21,7 +21,8 @@ package org.apache.brooklyn.location.cloud; import java.util.List; import brooklyn.entity.group.DynamicCluster; -import org.apache.brooklyn.location.Location; + +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.location.basic.MultiLocation; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/cloud/CloudLocationConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/cloud/CloudLocationConfig.java b/core/src/main/java/org/apache/brooklyn/location/cloud/CloudLocationConfig.java index 9682994..a44ca49 100644 --- a/core/src/main/java/org/apache/brooklyn/location/cloud/CloudLocationConfig.java +++ b/core/src/main/java/org/apache/brooklyn/location/cloud/CloudLocationConfig.java @@ -26,8 +26,10 @@ import com.google.common.reflect.TypeToken; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicConfigKey; -import org.apache.brooklyn.location.MachineLocationCustomizer; + +import org.apache.brooklyn.api.location.MachineLocationCustomizer; import org.apache.brooklyn.location.basic.LocationConfigKeys; + import brooklyn.util.flags.SetFromFlag; public interface CloudLocationConfig { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/cloud/names/CloudMachineNamer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/cloud/names/CloudMachineNamer.java b/core/src/main/java/org/apache/brooklyn/location/cloud/names/CloudMachineNamer.java index eaf7198..df7fd8b 100644 --- a/core/src/main/java/org/apache/brooklyn/location/cloud/names/CloudMachineNamer.java +++ b/core/src/main/java/org/apache/brooklyn/location/cloud/names/CloudMachineNamer.java @@ -19,9 +19,9 @@ package org.apache.brooklyn.location.cloud.names; import org.apache.brooklyn.api.entity.Entity; - -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.location.cloud.CloudLocationConfig; + 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/dynamic/DynamicLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/dynamic/DynamicLocation.java b/core/src/main/java/org/apache/brooklyn/location/dynamic/DynamicLocation.java index 78e6d87..4c38b7e 100644 --- a/core/src/main/java/org/apache/brooklyn/location/dynamic/DynamicLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/dynamic/DynamicLocation.java @@ -19,12 +19,12 @@ package org.apache.brooklyn.location.dynamic; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.Location; import com.google.common.annotations.Beta; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import org.apache.brooklyn.location.Location; import brooklyn.util.flags.SetFromFlag; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/dynamic/LocationOwner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/dynamic/LocationOwner.java b/core/src/main/java/org/apache/brooklyn/location/dynamic/LocationOwner.java index a2b0bfb..b061b69 100644 --- a/core/src/main/java/org/apache/brooklyn/location/dynamic/LocationOwner.java +++ b/core/src/main/java/org/apache/brooklyn/location/dynamic/LocationOwner.java @@ -22,13 +22,13 @@ 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 brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationDefinition; import brooklyn.util.flags.SetFromFlag; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/geo/HostGeoInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/geo/HostGeoInfo.java b/core/src/main/java/org/apache/brooklyn/location/geo/HostGeoInfo.java index d159a95..ad05bbd 100644 --- a/core/src/main/java/org/apache/brooklyn/location/geo/HostGeoInfo.java +++ b/core/src/main/java/org/apache/brooklyn/location/geo/HostGeoInfo.java @@ -24,8 +24,8 @@ import java.net.InetAddress; import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.location.AddressableLocation; -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.AddressableLocation; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.basic.LocationConfigKeys; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/java/org/apache/brooklyn/location/paas/PaasLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/paas/PaasLocation.java b/core/src/main/java/org/apache/brooklyn/location/paas/PaasLocation.java index e90f757..1d3537b 100644 --- a/core/src/main/java/org/apache/brooklyn/location/paas/PaasLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/paas/PaasLocation.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.location.paas; -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; /** * {@link Location} representing an application container on a PaaS provider. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver ---------------------------------------------------------------------- diff --git a/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver b/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver new file mode 100644 index 0000000..ec34011 --- /dev/null +++ b/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver @@ -0,0 +1,27 @@ +# +# 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. +# +org.apache.brooklyn.location.basic.DefinedLocationByIdResolver +org.apache.brooklyn.location.basic.NamedLocationResolver +org.apache.brooklyn.location.basic.CatalogLocationResolver +org.apache.brooklyn.location.basic.LocalhostLocationResolver +org.apache.brooklyn.location.basic.ByonLocationResolver +org.apache.brooklyn.location.basic.SingleMachineLocationResolver +org.apache.brooklyn.location.basic.HostLocationResolver +org.apache.brooklyn.location.basic.MultiLocationResolver +org.apache.brooklyn.location.access.PortForwardManagerLocationResolver http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/main/resources/META-INF/services/org.apache.brooklyn.location.LocationResolver ---------------------------------------------------------------------- diff --git a/core/src/main/resources/META-INF/services/org.apache.brooklyn.location.LocationResolver b/core/src/main/resources/META-INF/services/org.apache.brooklyn.location.LocationResolver deleted file mode 100644 index 721b7e7..0000000 --- a/core/src/main/resources/META-INF/services/org.apache.brooklyn.location.LocationResolver +++ /dev/null @@ -1,9 +0,0 @@ -org.apache.brooklyn.location.basic.DefinedLocationByIdResolver -org.apache.brooklyn.location.basic.NamedLocationResolver -org.apache.brooklyn.location.basic.CatalogLocationResolver -org.apache.brooklyn.location.basic.LocalhostLocationResolver -org.apache.brooklyn.location.basic.ByonLocationResolver -org.apache.brooklyn.location.basic.SingleMachineLocationResolver -org.apache.brooklyn.location.basic.HostLocationResolver -org.apache.brooklyn.location.basic.MultiLocationResolver -org.apache.brooklyn.location.access.PortForwardManagerLocationResolver \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java b/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java index 666e898..d761331 100644 --- a/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java @@ -23,6 +23,7 @@ import java.util.Collection; import org.apache.brooklyn.api.entity.Entity; 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.TestEntity; import org.slf4j.Logger; @@ -34,8 +35,9 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.Entities; import brooklyn.event.basic.BasicAttributeSensor; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.util.collections.MutableMap; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/EffectorMetadataTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/EffectorMetadataTest.java b/core/src/test/java/brooklyn/entity/EffectorMetadataTest.java index 485504e..66daf0b 100644 --- a/core/src/test/java/brooklyn/entity/EffectorMetadataTest.java +++ b/core/src/test/java/brooklyn/entity/EffectorMetadataTest.java @@ -28,6 +28,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.ParameterType; 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.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -38,7 +39,6 @@ import brooklyn.entity.basic.BasicParameterType; import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.effector.Effectors; import brooklyn.entity.trait.Startable; -import org.apache.brooklyn.location.Location; import brooklyn.management.internal.EffectorUtils; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/SetFromFlagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/SetFromFlagTest.java b/core/src/test/java/brooklyn/entity/SetFromFlagTest.java index e28038f..c5cfc0b 100644 --- a/core/src/test/java/brooklyn/entity/SetFromFlagTest.java +++ b/core/src/test/java/brooklyn/entity/SetFromFlagTest.java @@ -23,11 +23,13 @@ import static org.testng.Assert.assertEquals; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.PortRange; import org.testng.annotations.Test; import brooklyn.entity.basic.AbstractEntity; -import org.apache.brooklyn.location.PortRange; + import org.apache.brooklyn.location.basic.PortRanges; + import brooklyn.util.collections.MutableMap; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/basic/AbstractApplicationLegacyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/AbstractApplicationLegacyTest.java b/core/src/test/java/brooklyn/entity/basic/AbstractApplicationLegacyTest.java index b78562e..5604ed0 100644 --- a/core/src/test/java/brooklyn/entity/basic/AbstractApplicationLegacyTest.java +++ b/core/src/test/java/brooklyn/entity/basic/AbstractApplicationLegacyTest.java @@ -25,6 +25,7 @@ import static org.testng.Assert.assertTrue; import java.util.List; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; @@ -34,7 +35,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import brooklyn.entity.BrooklynAppUnitTestSupport; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SimulatedLocation; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java b/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java index cbd1c8b..b5c1074 100644 --- a/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java +++ b/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java @@ -27,6 +27,8 @@ import java.util.concurrent.atomic.AtomicReference; 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.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; @@ -41,10 +43,9 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; import org.apache.brooklyn.location.basic.Locations.LocationsFilter; import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.util.collections.MutableSet; public class BasicStartableTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java b/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java index 228a6fe..9fc43eb 100644 --- a/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java +++ b/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java @@ -25,6 +25,7 @@ import java.util.concurrent.atomic.AtomicReference; 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.api.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; @@ -34,8 +35,9 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java b/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java index 888e2e5..d7e2d1a 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java @@ -25,14 +25,16 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.Assert; 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.basic.SimulatedLocation; + import brooklyn.test.Asserts; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/basic/EntityFunctionsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityFunctionsTest.java b/core/src/test/java/brooklyn/entity/basic/EntityFunctionsTest.java index 8597942..949a25a 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityFunctionsTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityFunctionsTest.java @@ -22,12 +22,12 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -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/test/java/brooklyn/entity/basic/EntityLocationsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityLocationsTest.java b/core/src/test/java/brooklyn/entity/basic/EntityLocationsTest.java index 77ad89a..fbc1010 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityLocationsTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityLocationsTest.java @@ -24,12 +24,12 @@ import java.util.Arrays; import java.util.List; import org.apache.brooklyn.api.event.SensorEvent; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; import org.testng.Assert; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import org.apache.brooklyn.location.Location; import brooklyn.test.Asserts; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/basic/EntityPredicatesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityPredicatesTest.java b/core/src/test/java/brooklyn/entity/basic/EntityPredicatesTest.java index 8b47dd2..bf637c1 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityPredicatesTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityPredicatesTest.java @@ -22,13 +22,13 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.trait.Changeable; -import org.apache.brooklyn.location.Location; import brooklyn.util.text.StringPredicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/basic/EntitySuppliersTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntitySuppliersTest.java b/core/src/test/java/brooklyn/entity/basic/EntitySuppliersTest.java index edd1665..04324e1 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntitySuppliersTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntitySuppliersTest.java @@ -22,13 +22,14 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; 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.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.MachineProvisioningLocation; + import org.apache.brooklyn.location.basic.SshMachineLocation; import com.google.common.base.Supplier; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java b/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java index e08cf97..c573d62 100644 --- a/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java +++ b/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.basic; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; @@ -35,7 +36,6 @@ import brooklyn.entity.basic.ServiceStateLogic.ServiceNotUpLogic; import brooklyn.entity.basic.ServiceStateLogic.ServiceProblemsLogic; import brooklyn.entity.group.DynamicCluster; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.Location; import brooklyn.util.collections.QuorumCheck.QuorumChecks; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactoryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactoryTest.java b/core/src/test/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactoryTest.java index 2eb6a29..7595bbd 100644 --- a/core/src/test/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactoryTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactoryTest.java @@ -19,9 +19,10 @@ package brooklyn.entity.drivers; import brooklyn.entity.basic.AbstractEntity; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.paas.PaasLocation; + import brooklyn.test.location.TestPaasLocation; import brooklyn.util.collections.MutableMap; @@ -29,6 +30,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; 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.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/drivers/RegistryEntityDriverFactoryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/RegistryEntityDriverFactoryTest.java b/core/src/test/java/brooklyn/entity/drivers/RegistryEntityDriverFactoryTest.java index 7b45974..446617a 100644 --- a/core/src/test/java/brooklyn/entity/drivers/RegistryEntityDriverFactoryTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/RegistryEntityDriverFactoryTest.java @@ -24,15 +24,17 @@ import static org.testng.Assert.assertTrue; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity; +import org.apache.brooklyn.api.location.Location; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.drivers.ReflectiveEntityDriverFactoryTest.MyDriver; import brooklyn.entity.drivers.ReflectiveEntityDriverFactoryTest.MyDriverDependentEntity; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.SimulatedLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableMap; public class RegistryEntityDriverFactoryTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/drivers/downloads/BasicDownloadsRegistryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/downloads/BasicDownloadsRegistryTest.java b/core/src/test/java/brooklyn/entity/drivers/downloads/BasicDownloadsRegistryTest.java index 5be9551..64bfcd4 100644 --- a/core/src/test/java/brooklyn/entity/drivers/downloads/BasicDownloadsRegistryTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/downloads/BasicDownloadsRegistryTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.fail; 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.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; @@ -34,8 +35,9 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.management.internal.LocalManagementContext; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepoTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepoTest.java b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepoTest.java index 07f9f14..2ed52e4 100644 --- a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepoTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepoTest.java @@ -25,6 +25,7 @@ import java.util.List; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; @@ -35,8 +36,9 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.management.internal.LocalManagementContext; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromPropertiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromPropertiesTest.java b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromPropertiesTest.java index dc36f8c..a8d6e31 100644 --- a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromPropertiesTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromPropertiesTest.java @@ -25,6 +25,7 @@ import java.util.List; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; @@ -35,8 +36,9 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.management.internal.LocalManagementContext; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadSubstitutersTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadSubstitutersTest.java b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadSubstitutersTest.java index 344e16b..2e9a819 100644 --- a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadSubstitutersTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadSubstitutersTest.java @@ -25,13 +25,14 @@ import java.util.Map; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.BrooklynConfigKeys; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.SimulatedLocation; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/drivers/downloads/MyEntityDriver.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/downloads/MyEntityDriver.java b/core/src/test/java/brooklyn/entity/drivers/downloads/MyEntityDriver.java index 02154f7..8398030 100644 --- a/core/src/test/java/brooklyn/entity/drivers/downloads/MyEntityDriver.java +++ b/core/src/test/java/brooklyn/entity/drivers/downloads/MyEntityDriver.java @@ -21,8 +21,7 @@ package brooklyn.entity.drivers.downloads; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.drivers.EntityDriver; - -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; public class MyEntityDriver implements EntityDriver { private final Entity entity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java b/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java index 1418868..cd300e4 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java @@ -54,6 +54,7 @@ import brooklyn.entity.basic.Lifecycle; 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.location.Location; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; import org.apache.brooklyn.test.EntityTestUtils; @@ -63,8 +64,9 @@ import org.apache.brooklyn.test.entity.TestEntityImpl; import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.trait.Changeable; import brooklyn.entity.trait.FailingEntity; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.SimulatedLocation; + 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/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java b/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java index 064f2ac..f0e3105 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java @@ -31,6 +31,8 @@ import java.util.concurrent.atomic.AtomicLong; 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.management.ManagementContext; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; @@ -40,12 +42,12 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector; import brooklyn.entity.trait.FailingEntity; -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.SimulatedLocation; import org.apache.brooklyn.location.cloud.AbstractAvailabilityZoneExtension; import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; + import brooklyn.test.Asserts; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java b/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java index 0ce3faf..593ac84 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java @@ -34,6 +34,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.test.TestUtils; import org.apache.brooklyn.test.entity.BlockingEntity; @@ -49,9 +50,10 @@ import brooklyn.entity.basic.BasicEntity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityFactory; import brooklyn.entity.trait.Startable; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.test.Asserts; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java b/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java index b0821e5..f75267a 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java @@ -26,13 +26,15 @@ import java.util.Set; 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.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/group/GroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/GroupTest.java b/core/src/test/java/brooklyn/entity/group/GroupTest.java index ab73812..8d0f9a9 100644 --- a/core/src/test/java/brooklyn/entity/group/GroupTest.java +++ b/core/src/test/java/brooklyn/entity/group/GroupTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; @@ -35,8 +36,9 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.test.Asserts; public class GroupTest extends BrooklynAppUnitTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java b/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java index 65ab601..f3ee6e9 100644 --- a/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java +++ b/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java @@ -28,6 +28,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.Sensor; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.EntityManager; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.entity.TestEntity; @@ -38,8 +39,9 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.Entities; import brooklyn.entity.trait.Startable; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/group/QuarantineGroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/QuarantineGroupTest.java b/core/src/test/java/brooklyn/entity/group/QuarantineGroupTest.java index b96310e..b6b6788 100644 --- a/core/src/test/java/brooklyn/entity/group/QuarantineGroupTest.java +++ b/core/src/test/java/brooklyn/entity/group/QuarantineGroupTest.java @@ -22,13 +22,14 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SimulatedLocation; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java b/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java index 975db33..f2a08da 100644 --- a/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java +++ b/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java @@ -22,14 +22,16 @@ import java.util.List; 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.location.LocationSpec; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.test.Asserts; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java b/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java index 367952b..5c618c5 100644 --- a/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java +++ b/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java @@ -25,13 +25,15 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.test.entity.TestEntity; 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.basic.SimulatedLocation; + 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/test/java/brooklyn/entity/rebind/RebindEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java index 5e9f9d9..bbd26d0 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java @@ -29,6 +29,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; 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.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.EntityTestUtils; @@ -49,8 +50,9 @@ import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.group.DynamicCluster; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.test.Asserts; import brooklyn.util.collections.MutableSet; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java index cf246d1..45c3721 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java @@ -47,6 +47,8 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.event.AttributeSensor.SensorPersistenceMode; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.mementos.BrooklynMementoManifest; import org.apache.brooklyn.mementos.EntityMemento; @@ -69,9 +71,9 @@ import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.BasicSensorEvent; import brooklyn.event.basic.DependentConfiguration; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.LocationConfigTest.MyLocation; + import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java index 6935a48..db51a91 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java @@ -27,6 +27,7 @@ import java.util.List; import org.apache.brooklyn.api.entity.Feed; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl.TestEntityWithoutEnrichers; @@ -49,9 +50,10 @@ import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.event.feed.ssh.SshFeed; import brooklyn.event.feed.ssh.SshPollConfig; import brooklyn.event.feed.ssh.SshValueFunctions; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.management.internal.BrooklynGarbageCollector; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/rebind/RebindLocalhostLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindLocalhostLocationTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindLocalhostLocationTest.java index aac9b21..54b4b14 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindLocalhostLocationTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindLocalhostLocationTest.java @@ -29,8 +29,7 @@ import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java index c245d85..6df2b7f 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java @@ -30,6 +30,8 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.entity.rebind.RebindSupport; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.mementos.LocationMemento; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; @@ -39,9 +41,9 @@ import org.testng.annotations.Test; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.rebind.RebindEntityTest.MyEntity; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.AbstractLocation; + import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java index 0223324..9dcdfc9 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java @@ -28,6 +28,7 @@ import java.util.Map; 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.mementos.BrooklynMementoManifest; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.Policy; @@ -42,8 +43,9 @@ import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.rebind.RebindEnricherTest.MyEnricher; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.Locations; + import brooklyn.policy.basic.AbstractPolicy; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/rebind/RebindSshMachineLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindSshMachineLocationTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindSshMachineLocationTest.java index 89c4875..c617311 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindSshMachineLocationTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindSshMachineLocationTest.java @@ -27,8 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java b/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java index c7b02d8..104ee7e 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java @@ -32,6 +32,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.api.entity.trait.Identifiable; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.api.management.ha.ManagementNodeState; @@ -49,7 +50,6 @@ import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.FileBasedObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.PersistenceObjectStore; -import org.apache.brooklyn.location.Location; import brooklyn.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.internal.ManagementContextInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/rebind/RecordingRebindExceptionHandler.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RecordingRebindExceptionHandler.java b/core/src/test/java/brooklyn/entity/rebind/RecordingRebindExceptionHandler.java index f6860fc..9ac62a4 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RecordingRebindExceptionHandler.java +++ b/core/src/test/java/brooklyn/entity/rebind/RecordingRebindExceptionHandler.java @@ -25,8 +25,7 @@ import org.apache.brooklyn.api.basic.BrooklynObject; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.entity.rebind.RebindManager; - -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; import com.google.common.collect.Lists; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java index 6806e42..3b63804 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java @@ -27,6 +27,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; import org.apache.brooklyn.api.entity.rebind.RebindManager.RebindFailureMode; +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.mementos.BrooklynMemento; import org.apache.brooklyn.mementos.BrooklynMementoPersister; @@ -47,9 +49,9 @@ import brooklyn.entity.rebind.PersistenceExceptionHandlerImpl; import brooklyn.entity.rebind.RebindContextImpl; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.entity.rebind.RecordingRebindExceptionHandler; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.test.policy.TestPolicy; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java index 3d4acd4..54b97a1 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java @@ -33,6 +33,8 @@ import java.util.Set; import brooklyn.management.osgi.OsgiTestResources; import org.apache.brooklyn.location.basic.SimulatedLocation; +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.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.policy.Enricher; @@ -58,8 +60,6 @@ import brooklyn.catalog.internal.CatalogItemDtoAbstract; import brooklyn.catalog.internal.CatalogTestUtils; import brooklyn.entity.basic.Entities; import brooklyn.entity.group.DynamicCluster; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; import brooklyn.management.osgi.OsgiVersionMoreEntityTest; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java b/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java index 71cf3f7..4d1d9f9 100644 --- a/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java +++ b/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java @@ -20,12 +20,12 @@ package brooklyn.entity.trait; import java.util.Collection; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.test.entity.TestEntityImpl; import org.testng.Assert; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.task.Tasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java b/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java index 6683bdd..434f802 100644 --- a/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java +++ b/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java @@ -35,6 +35,7 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; 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.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; @@ -48,8 +49,9 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.EntityInternal.FeedSupport; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; + import brooklyn.test.Asserts; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java b/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java index b2f3ef8..27e3a6e 100644 --- a/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java +++ b/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java @@ -26,6 +26,7 @@ import java.net.URI; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; @@ -34,9 +35,10 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.PortRanges; + import brooklyn.test.Asserts; import brooklyn.test.HttpService;
