http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java index 6a7e297..a7a8abe 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertTrue; import java.util.Map; 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.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; @@ -33,7 +34,6 @@ import com.google.common.collect.ImmutableList; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Attributes; -import org.apache.brooklyn.location.Location; import brooklyn.util.collections.MutableMap; public class ServerPoolLiveTest extends AbstractServerPoolTest {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java index 6b6c045..e6c3ab6 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java @@ -24,6 +24,8 @@ import java.util.Map; 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.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; @@ -37,10 +39,10 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.dynamic.DynamicLocation; + import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java index ef7c8c4..ba0e938 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java @@ -26,6 +26,7 @@ import java.util.Collection; import java.util.Iterator; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -34,7 +35,7 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Lifecycle; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; import com.google.common.base.Joiner; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java index e64ccdb..c0bf566 100644 --- a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java @@ -21,7 +21,6 @@ package brooklyn.entity.software; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; @@ -29,6 +28,7 @@ import com.google.common.base.CaseFormat; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java b/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java index ae5f436..599b7ac 100644 --- a/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.software; import java.util.Arrays; import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.test.entity.TestApplication; @@ -34,9 +35,10 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.effector.Effectors; import brooklyn.entity.software.SshEffectorTasks.SshEffectorBody; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.config.ConfigBag; import brooklyn.util.task.system.ProcessTaskWrapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java b/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java index dcea2bb..8494e36 100644 --- a/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java @@ -22,6 +22,7 @@ import java.io.File; import java.io.IOException; import java.util.Arrays; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.api.management.TaskFactory; @@ -35,9 +36,10 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.exceptions.PropagatedRuntimeException; import brooklyn.util.net.Urls; import brooklyn.util.task.ssh.SshFetchTaskWrapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java b/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java index 81a2a5b..eb53f3e 100644 --- a/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.software.http; 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.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -31,7 +32,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.Location; import brooklyn.test.TestHttpRequestHandler; import brooklyn.test.TestHttpServer; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java b/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java index 6521467..98bae62 100644 --- a/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java @@ -19,6 +19,8 @@ package brooklyn.entity.software.mysql; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,10 +32,10 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.software.SshEffectorTasks; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.MachineProvisioningLocation; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.task.system.ProcessTaskWrapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java b/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java index b7144dd..df3e436 100644 --- a/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java +++ b/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java @@ -24,6 +24,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntityInitializer; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.OsDetails; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,11 +34,11 @@ import brooklyn.entity.basic.BasicStartable; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.software.MachineLifecycleEffectorTasks; import brooklyn.entity.software.SshEffectorTasks; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.OsDetails; + import org.apache.brooklyn.location.basic.BasicOsDetails.OsVersions; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.ssh.BashCommands; import brooklyn.util.task.DynamicTasks; import brooklyn.util.task.Tasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java index c69fb37..2d142e4 100644 --- a/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java @@ -26,6 +26,7 @@ import org.apache.brooklyn.api.entity.Effector; 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.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -38,8 +39,9 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.effector.Effectors; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/event/basic/PortAttributeSensorAndConfigKeyTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/event/basic/PortAttributeSensorAndConfigKeyTest.java b/software/base/src/test/java/brooklyn/event/basic/PortAttributeSensorAndConfigKeyTest.java index 2db5108..3698a91 100644 --- a/software/base/src/test/java/brooklyn/event/basic/PortAttributeSensorAndConfigKeyTest.java +++ b/software/base/src/test/java/brooklyn/event/basic/PortAttributeSensorAndConfigKeyTest.java @@ -22,13 +22,14 @@ import static org.testng.Assert.assertEquals; 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.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.EmptySoftwareProcessImpl; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; + 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/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java b/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java index 6e444c1..433370a 100644 --- a/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java +++ b/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java @@ -25,6 +25,7 @@ import java.util.Collection; 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; @@ -42,9 +43,10 @@ import brooklyn.entity.java.UsesJmx.JmxAgentModes; import brooklyn.entity.rebind.RebindTestFixtureWithApp; import brooklyn.event.basic.Sensors; import brooklyn.event.feed.ConfigToAttributes; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.PortRanges; + import brooklyn.test.GeneralisedDynamicMBean; import brooklyn.test.JmxService; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java b/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java index fac6ee4..4d032df 100644 --- a/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java +++ b/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -40,7 +41,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.proxying.EntityProxy; -import org.apache.brooklyn.location.Location; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.management.internal.UsageListener.ApplicationMetadata; import brooklyn.management.usage.ApplicationUsage.ApplicationEvent; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java b/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java index fb047ef..61032c4 100644 --- a/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java +++ b/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java @@ -28,17 +28,19 @@ 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.api.location.LocationSpec; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.SoftwareProcessEntityTest; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.NoMachinesAvailableException; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.management.internal.UsageListener.LocationMetadata; import brooklyn.management.usage.LocationUsage.LocationEvent; import brooklyn.test.Asserts; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java b/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java index ea3dedb..863f587 100644 --- a/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java +++ b/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java @@ -32,7 +32,9 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; + +import org.apache.brooklyn.api.location.Location; + import brooklyn.management.internal.ManagementContextInternal; import brooklyn.management.internal.UsageManager; import brooklyn.test.Asserts; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsEc2LiveTest.java b/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsEc2LiveTest.java index fce5c94..105479d 100644 --- a/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsEc2LiveTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsEc2LiveTest.java @@ -23,6 +23,9 @@ import static org.testng.Assert.assertNotNull; 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.MachineDetails; +import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,9 +35,6 @@ import com.google.common.collect.ImmutableList; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.trait.Startable; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.MachineDetails; -import org.apache.brooklyn.location.OsDetails; import brooklyn.util.collections.MutableMap; // This test really belongs in brooklyn-location but depends on AbstractEc2LiveTest in brooklyn-software-base http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsGoogleComputeLiveTest.java b/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsGoogleComputeLiveTest.java index bcee1a3..36db1f4 100644 --- a/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsGoogleComputeLiveTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsGoogleComputeLiveTest.java @@ -23,9 +23,9 @@ import static org.testng.Assert.assertNotNull; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.MachineDetails; -import org.apache.brooklyn.location.OsDetails; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.MachineDetails; +import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/base/src/test/java/org/apache/brooklyn/location/basic/WinRmMachineLocationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/location/basic/WinRmMachineLocationTest.java b/software/base/src/test/java/org/apache/brooklyn/location/basic/WinRmMachineLocationTest.java index 97b9358..103c3f0 100644 --- a/software/base/src/test/java/org/apache/brooklyn/location/basic/WinRmMachineLocationTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/location/basic/WinRmMachineLocationTest.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.location.basic; import static org.testng.Assert.assertEquals; -import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbSshDriver.java b/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbSshDriver.java index 1833024..b35a1cd 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbSshDriver.java +++ b/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbSshDriver.java @@ -39,8 +39,10 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.database.DatastoreMixins; import brooklyn.entity.software.SshEffectorTasks; -import org.apache.brooklyn.location.OsDetails; + +import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Urls; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlClusterImpl.java b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlClusterImpl.java index c0cfb46..6f752c2 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlClusterImpl.java +++ b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlClusterImpl.java @@ -30,6 +30,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 com.google.common.base.Function; import com.google.common.base.Functions; @@ -52,7 +53,6 @@ import brooklyn.event.basic.DependentConfiguration; import brooklyn.event.basic.Sensors; import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.function.FunctionPollConfig; -import org.apache.brooklyn.location.Location; import brooklyn.util.collections.CollectionFunctionals; import brooklyn.util.guava.Functionals; import brooklyn.util.guava.IfFunctions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java index e600e5b..2e748e8 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java +++ b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java @@ -41,9 +41,11 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.database.DatastoreMixins; import brooklyn.entity.software.SshEffectorTasks; -import org.apache.brooklyn.location.OsDetails; + +import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.location.basic.BasicOsDetails.OsVersions; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.io.FileUtil; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java index 29f9c10..a23f2bc 100644 --- a/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java +++ b/software/database/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java @@ -46,8 +46,10 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.database.DatastoreMixins; import brooklyn.entity.software.SshEffectorTasks; -import org.apache.brooklyn.location.OsDetails; + +import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.location.basic.SshMachineLocation; + 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/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java b/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java index f1e7886..a860f1c 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java +++ b/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java @@ -19,12 +19,13 @@ package brooklyn.entity.database.mariadb; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.jclouds.JcloudsLocation; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterLiveEc2Test.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterLiveEc2Test.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterLiveEc2Test.java index 807b462..477f81b 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterLiveEc2Test.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterLiveEc2Test.java @@ -21,7 +21,8 @@ package brooklyn.entity.database.mysql; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; -import org.apache.brooklyn.location.Location; + +import org.apache.brooklyn.api.location.Location; @Test(groups = { "Live" }) public class MySqlClusterLiveEc2Test extends AbstractEc2LiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterLiveSoftlayerTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterLiveSoftlayerTest.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterLiveSoftlayerTest.java index 06bd0bc..6f1556c 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterLiveSoftlayerTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterLiveSoftlayerTest.java @@ -21,7 +21,8 @@ package brooklyn.entity.database.mysql; import org.testng.annotations.Test; import brooklyn.entity.AbstractSoftlayerLiveTest; -import org.apache.brooklyn.location.Location; + +import org.apache.brooklyn.api.location.Location; @Test(groups = { "Live" }) public class MySqlClusterLiveSoftlayerTest extends AbstractSoftlayerLiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java index 7fac59a..739d818 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertEquals; import java.util.List; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +34,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import brooklyn.entity.database.VogellaExampleAccess; -import org.apache.brooklyn.location.Location; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java index e874ce6..c9d5e97 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java @@ -19,12 +19,12 @@ package brooklyn.entity.database.mysql; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; -import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveGceTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveGceTest.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveGceTest.java index b5e4543..f6322bd 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveGceTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveGceTest.java @@ -19,12 +19,12 @@ package brooklyn.entity.database.mysql; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; import brooklyn.entity.AbstractGoogleComputeLiveTest; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; -import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/test/java/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java index aa7ae45..0642dd6 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java @@ -21,11 +21,11 @@ package brooklyn.entity.database.mysql; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; import brooklyn.entity.software.AbstractDockerLiveTest; -import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; public class MysqlDockerLiveTest extends AbstractDockerLiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java index 8a4805c..8b23415 100644 --- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java @@ -21,11 +21,11 @@ package brooklyn.entity.database.postgresql; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; import brooklyn.entity.software.AbstractDockerLiveTest; -import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; public class PostgreSqDockerLiveTest extends AbstractDockerLiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java index 6f650ec..5d8e984 100644 --- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java @@ -31,9 +31,11 @@ import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; import brooklyn.entity.effector.EffectorTasks; import brooklyn.entity.software.SshEffectorTasks; -import org.apache.brooklyn.location.PortRange; + +import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java index f90f6fa..5eda573 100644 --- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java @@ -19,12 +19,12 @@ package brooklyn.entity.database.postgresql; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; -import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java index 4ae3600..70e44e0 100644 --- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java @@ -19,12 +19,12 @@ package brooklyn.entity.database.postgresql; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; import brooklyn.entity.AbstractGoogleComputeLiveTest; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.VogellaExampleAccess; -import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java index 02a00fc..c53db06 100644 --- a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java @@ -19,13 +19,14 @@ package brooklyn.entity.database.rubyrep; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import brooklyn.entity.database.postgresql.PostgreSqlNode; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.PortRanges; public class RubyRepEc2LiveTest extends AbstractEc2LiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java index 0ef7081..e56b990 100644 --- a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.List; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -41,9 +42,10 @@ import brooklyn.entity.database.mysql.MySqlIntegrationTest; import brooklyn.entity.database.mysql.MySqlNode; import brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import brooklyn.entity.database.postgresql.PostgreSqlNode; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.PortRanges; + import brooklyn.management.internal.LocalManagementContext; public class RubyRepIntegrationTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java index da28512..845dce7 100644 --- a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java @@ -21,14 +21,16 @@ package brooklyn.entity.database.rubyrep; import java.util.Arrays; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import brooklyn.entity.database.postgresql.PostgreSqlNode; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.net.Protocol; import brooklyn.util.ssh.IptablesCommands; import brooklyn.util.ssh.IptablesCommands.Chain; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java index 99020bc..b5b8449 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaClusterImpl.java @@ -23,6 +23,7 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +34,6 @@ import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.trait.Startable; import brooklyn.entity.zookeeper.ZooKeeperNode; import brooklyn.event.feed.ConfigToAttributes; -import org.apache.brooklyn.location.Location; import brooklyn.util.collections.MutableList; import brooklyn.util.exceptions.CompoundRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java b/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java index 4c0a73a..75db6ff 100644 --- a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java @@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; 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.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +33,6 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.DynamicClusterImpl; -import org.apache.brooklyn.location.Location; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java index fc58d6f..aaffda8 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java @@ -29,12 +29,12 @@ import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.trait.Startable; -import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java index 698bc5e..e26dc2d 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java @@ -20,12 +20,12 @@ package brooklyn.entity.messaging.activemq; import brooklyn.entity.AbstractGoogleComputeLiveTest; import brooklyn.entity.trait.Startable; -import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java index d156b4d..e6b6db5 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java @@ -32,6 +32,7 @@ import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -46,7 +47,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.java.UsesJmx; import brooklyn.entity.java.UsesJmx.JmxAgentModes; import brooklyn.entity.trait.Startable; -import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java index d568bd2..39d3e59 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java @@ -25,6 +25,8 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.Callable; 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.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; @@ -35,9 +37,9 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.entity.messaging.activemq.ActiveMQBroker; import brooklyn.entity.trait.Startable; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; + import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaLiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaLiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaLiveTest.java index 0656bc6..7d122c6 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaLiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaLiveTest.java @@ -24,11 +24,11 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.basic.Entities; import brooklyn.entity.trait.Startable; -import org.apache.brooklyn.location.Location; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidEc2LiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidEc2LiveTest.java index d3a860c..06af482 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidEc2LiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidEc2LiveTest.java @@ -19,11 +19,11 @@ package brooklyn.entity.messaging.qpid; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; -import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java index 7c5d262..7346297 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java @@ -34,6 +34,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.entity.TestApplication; @@ -50,7 +51,6 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.trait.Startable; -import org.apache.brooklyn.location.Location; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitEc2LiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitEc2LiveTest.java index 7db574b..8eaa991 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitEc2LiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitEc2LiveTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.messaging.rabbit; import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +31,6 @@ import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.messaging.MessageBroker; import brooklyn.entity.messaging.amqp.AmqpExchange; -import org.apache.brooklyn.location.Location; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java index d08eb97..c5f6f22 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java @@ -24,6 +24,7 @@ import static org.testng.Assert.assertFalse; import java.io.IOException; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -37,7 +38,7 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.messaging.MessageBroker; import brooklyn.entity.messaging.amqp.AmqpExchange; import brooklyn.entity.trait.Startable; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import com.google.common.base.Charsets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java index f18af02..a2317ec 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java @@ -29,6 +29,7 @@ import java.io.File; import java.util.Map; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,7 +51,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.messaging.storm.topologies.ExclamationBolt; import brooklyn.entity.trait.Startable; import brooklyn.entity.zookeeper.ZooKeeperEnsemble; -import org.apache.brooklyn.location.Location; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormEc2LiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormEc2LiveTest.java index 35a83f4..d949450 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormEc2LiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/storm/StormEc2LiveTest.java @@ -19,6 +19,7 @@ package brooklyn.entity.messaging.storm; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; @@ -26,7 +27,6 @@ import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.basic.Entities; import brooklyn.entity.trait.Startable; import brooklyn.entity.zookeeper.ZooKeeperNode; -import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEc2LiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEc2LiveTest.java index ccb8f5d..a6c7d2b 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEc2LiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEc2LiveTest.java @@ -19,6 +19,7 @@ package brooklyn.entity.messaging.zookeeper; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; @@ -26,7 +27,6 @@ import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.basic.Entities; import brooklyn.entity.trait.Startable; import brooklyn.entity.zookeeper.ZooKeeperNode; -import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java index 42091fd..cb21c18 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java @@ -24,7 +24,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.trait.Startable; import brooklyn.entity.zookeeper.ZooKeeperEnsemble; import brooklyn.entity.zookeeper.ZooKeeperNode; -import org.apache.brooklyn.location.Location; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; @@ -32,6 +31,7 @@ import com.google.common.util.concurrent.Uninterruptibles; 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.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNodeImpl.java b/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNodeImpl.java index dd712c4..7f71754 100644 --- a/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNodeImpl.java +++ b/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNodeImpl.java @@ -21,6 +21,7 @@ package org.apache.brooklyn.entity.monitoring.monit; 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; @@ -28,8 +29,9 @@ import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.event.feed.ssh.SshFeed; import brooklyn.event.feed.ssh.SshPollConfig; import brooklyn.event.feed.ssh.SshPollValue; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.text.Strings; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitSshDriver.java ---------------------------------------------------------------------- diff --git a/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitSshDriver.java b/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitSshDriver.java index 28b8548..b9e55af 100644 --- a/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitSshDriver.java +++ b/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitSshDriver.java @@ -26,8 +26,10 @@ import java.util.Map; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.lifecycle.ScriptHelper; -import org.apache.brooklyn.location.OsDetails; + +import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableMap; import brooklyn.util.os.Os; import brooklyn.util.ssh.BashCommands; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/monitoring/src/test/java/org/apache/brooklyn/entity/monitoring/monit/MonitIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/monitoring/src/test/java/org/apache/brooklyn/entity/monitoring/monit/MonitIntegrationTest.java b/software/monitoring/src/test/java/org/apache/brooklyn/entity/monitoring/monit/MonitIntegrationTest.java index 4cb8e39..5b58c72 100644 --- a/software/monitoring/src/test/java/org/apache/brooklyn/entity/monitoring/monit/MonitIntegrationTest.java +++ b/software/monitoring/src/test/java/org/apache/brooklyn/entity/monitoring/monit/MonitIntegrationTest.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.MachineDetails; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,8 +43,9 @@ import brooklyn.entity.basic.SameServerEntity; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.database.mysql.MySqlNode; import brooklyn.event.basic.DependentConfiguration; -import org.apache.brooklyn.location.MachineDetails; + 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/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java index a766dd1..20c0e36 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerByonLiveTest.java @@ -25,7 +25,9 @@ import org.testng.annotations.Parameters; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppLiveTestSupport; -import org.apache.brooklyn.location.Location; + +import org.apache.brooklyn.api.location.Location; + import brooklyn.util.text.Strings; public class BindDnsServerByonLiveTest extends BrooklynAppLiveTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerEc2LiveTest.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerEc2LiveTest.java index e9cbaff..7347a26 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerEc2LiveTest.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerEc2LiveTest.java @@ -22,7 +22,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.AbstractEc2LiveTest; -import org.apache.brooklyn.location.Location; + +import org.apache.brooklyn.api.location.Location; public class BindDnsServerEc2LiveTest extends AbstractEc2LiveTest { private static final Logger LOG = LoggerFactory.getLogger(BindDnsServerEc2LiveTest.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java index d73eb0c..8a7bbd6 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java @@ -22,6 +22,7 @@ import static org.apache.brooklyn.test.EntityTestUtils.assertAttributeEqualsEven import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -37,7 +38,6 @@ import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SameServerEntity; import brooklyn.entity.group.DynamicCluster; -import org.apache.brooklyn.location.Location; import brooklyn.util.repeat.Repeater; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSoftlayerLiveTest.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSoftlayerLiveTest.java index ffe391d..01a0d1e 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSoftlayerLiveTest.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSoftlayerLiveTest.java @@ -21,7 +21,8 @@ package org.apache.brooklyn.entity.network.bind; import org.testng.annotations.Test; import brooklyn.entity.AbstractSoftlayerLiveTest; -import org.apache.brooklyn.location.Location; + +import org.apache.brooklyn.api.location.Location; public class BindDnsServerSoftlayerLiveTest extends AbstractSoftlayerLiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java index 44141a6..9ae4edd 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java @@ -33,6 +33,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.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,8 +48,9 @@ import brooklyn.entity.basic.ServiceStateLogic.ServiceNotUpLogic; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.DynamicClusterImpl; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.Machines; + import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java index a3cf775..8a5fe34 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java @@ -24,13 +24,13 @@ import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.location.Location; import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.group.DynamicFabric; -import org.apache.brooklyn.location.Location; import com.google.common.base.Function; import com.google.common.collect.Multimap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java index 6ae43b5..1922c10 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java @@ -26,6 +26,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +39,6 @@ import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.DynamicFabricImpl; -import org.apache.brooklyn.location.Location; import brooklyn.util.collections.CollectionFunctionals; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java index 41c3d97..2d82d19 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java @@ -34,6 +34,8 @@ import javax.management.ObjectName; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,10 +54,10 @@ import brooklyn.event.feed.jmx.JmxAttributePollConfig; import brooklyn.event.feed.jmx.JmxFeed; import brooklyn.event.feed.jmx.JmxHelper; import brooklyn.event.feed.jmx.JmxOperationPollConfig; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.MachineProvisioningLocation; + import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.cloud.CloudLocationConfig; + import brooklyn.util.collections.MutableSet; import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java index 88a66c2..c3a57b0 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java @@ -29,6 +29,7 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.TaskWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,10 +45,11 @@ import brooklyn.entity.java.JavaSoftwareProcessSshDriver; import brooklyn.entity.java.UsesJmx; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.basic.DependentConfiguration; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.basic.SshMachineLocation; + 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/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java index eaf8794..07b34b4 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.entity.Entity; 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.MachineProvisioningLocation; import org.apache.http.auth.UsernamePasswordCredentials; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,9 +41,10 @@ import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.event.feed.http.JsonFunctions; -import org.apache.brooklyn.location.MachineProvisioningLocation; + import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.cloud.CloudLocationConfig; + import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java index cf80118..41bef9f 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java @@ -31,6 +31,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.api.management.Task; import org.apache.http.auth.UsernamePasswordCredentials; @@ -43,9 +44,10 @@ import brooklyn.entity.drivers.downloads.DownloadProducerFromUrlAttribute; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.basic.DependentConfiguration; import brooklyn.event.feed.http.HttpValueFunctions; -import org.apache.brooklyn.location.OsDetails; + import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableMap; import brooklyn.util.http.HttpTool; import brooklyn.util.http.HttpToolResponse; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java index f3d7636..5d598e5 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java @@ -29,13 +29,15 @@ import java.util.List; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver; +import org.apache.brooklyn.api.location.OsDetails; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityPredicates; import brooklyn.event.basic.DependentConfiguration; -import org.apache.brooklyn.location.OsDetails; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableMap; import brooklyn.util.ssh.BashCommands; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java index 308aede..845c3a0 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java @@ -29,8 +29,10 @@ import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Attributes; -import org.apache.brooklyn.location.Location; + +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Networking; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java index 6a4c052..c7f6723 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java @@ -23,14 +23,16 @@ import java.util.List; import java.util.Map; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.location.OsDetails; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.lifecycle.ScriptHelper; -import org.apache.brooklyn.location.OsDetails; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.exceptions.Exceptions; import brooklyn.util.net.Networking; import brooklyn.util.os.Os;
