Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6A26418379 for ; Fri, 14 Aug 2015 03:43:35 +0000 (UTC) Received: (qmail 95061 invoked by uid 500); 14 Aug 2015 03:43:35 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 95038 invoked by uid 500); 14 Aug 2015 03:43:35 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 95029 invoked by uid 99); 14 Aug 2015 03:43:35 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Aug 2015 03:43:35 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 9E2DEC211D for ; Fri, 14 Aug 2015 03:43:34 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.774 X-Spam-Level: * X-Spam-Status: No, score=1.774 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.006] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id 0ahbc_Er_YZc for ; Fri, 14 Aug 2015 03:43:17 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 4BA5825455 for ; Fri, 14 Aug 2015 03:42:38 +0000 (UTC) Received: (qmail 92132 invoked by uid 99); 14 Aug 2015 03:42:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Aug 2015 03:42:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1C87EDFFC2; Fri, 14 Aug 2015 03:42:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hadrian@apache.org To: commits@brooklyn.incubator.apache.org Date: Fri, 14 Aug 2015 03:43:19 -0000 Message-Id: <87c13b985ff946d19c6216602c77a81e@git.apache.org> In-Reply-To: <2fb1e821390b430fbcf0db11f5658ffc@git.apache.org> References: <2fb1e821390b430fbcf0db11f5658ffc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [50/54] incubator-brooklyn git commit: [BROOKLYN-162] Move ./api/location to the right package http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java b/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java index a1d0851..aa16b8c 100644 --- a/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java +++ b/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java @@ -28,6 +28,7 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +45,6 @@ import brooklyn.entity.basic.EntityInternal.FeedSupport; import brooklyn.event.basic.Sensors; import brooklyn.event.feed.FeedConfig; import brooklyn.event.feed.PollConfig; -import org.apache.brooklyn.location.Location; 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/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java b/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java index 7ecba77..4aa55d7 100644 --- a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java +++ b/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java @@ -23,6 +23,9 @@ import java.util.Map; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; @@ -30,9 +33,6 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppLiveTestSupport; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.MachineProvisioningLocation; import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java b/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java index 33b8934..18a7f40 100644 --- a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java +++ b/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java @@ -29,6 +29,7 @@ import java.util.Iterator; 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.slf4j.Logger; @@ -39,8 +40,9 @@ 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 brooklyn.util.text.Strings; import io.cloudsoft.winrm4j.winrm.WinRmToolResponse; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java b/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java index 018641e..63ee8a0 100644 --- a/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java +++ b/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java @@ -23,6 +23,7 @@ import java.net.URI; import org.apache.brooklyn.api.entity.Application; 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.LocalManagementContextForTests; import org.testng.Assert; @@ -36,7 +37,6 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; import brooklyn.management.entitlement.Entitlements.EntityAndItem; import brooklyn.management.entitlement.Entitlements.StringAndArgument; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java b/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java index c4c8956..b6bf5c1 100644 --- a/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java +++ b/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java @@ -20,6 +20,7 @@ package brooklyn.management.entitlement; import org.apache.brooklyn.api.entity.Application; 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.LocalManagementContextForTests; import org.slf4j.Logger; @@ -34,7 +35,6 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; import brooklyn.management.entitlement.Entitlements.EntityAndItem; import brooklyn.management.entitlement.Entitlements.StringAndArgument; import brooklyn.management.internal.LocalManagementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerInMemoryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerInMemoryTest.java b/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerInMemoryTest.java index 1062229..ff86733 100644 --- a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerInMemoryTest.java +++ b/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerInMemoryTest.java @@ -23,6 +23,8 @@ 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.NoMachinesAvailableException; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -34,10 +36,10 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.rebind.persister.InMemoryObjectStore; import brooklyn.entity.rebind.persister.PersistenceObjectStore; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.NoMachinesAvailableException; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerSplitBrainTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerSplitBrainTest.java b/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerSplitBrainTest.java index ea99621..e747a82 100644 --- a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerSplitBrainTest.java +++ b/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerSplitBrainTest.java @@ -28,6 +28,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicLong; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; @@ -50,7 +51,6 @@ import brooklyn.entity.rebind.persister.ListeningObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.PersistenceObjectStore; import brooklyn.internal.BrooklynFeatureEnablement; -import org.apache.brooklyn.location.Location; import brooklyn.management.ha.TestEntityFailingRebind.RebindException; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.test.Asserts; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java b/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java index ae9e3b4..f061289 100644 --- a/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java +++ b/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java @@ -33,6 +33,8 @@ import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Feed; 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.ha.HighAvailabilityMode; import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister; @@ -58,9 +60,9 @@ import brooklyn.entity.rebind.persister.InMemoryObjectStore; import brooklyn.entity.rebind.persister.ListeningObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.PersistenceObjectStore; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; + import brooklyn.management.internal.AbstractManagementContext; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/management/ha/WarmStandbyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/ha/WarmStandbyTest.java b/core/src/test/java/brooklyn/management/ha/WarmStandbyTest.java index 4afc78c..54f4b8b 100644 --- a/core/src/test/java/brooklyn/management/ha/WarmStandbyTest.java +++ b/core/src/test/java/brooklyn/management/ha/WarmStandbyTest.java @@ -24,6 +24,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister; @@ -42,7 +43,6 @@ import brooklyn.entity.rebind.persister.InMemoryObjectStore; import brooklyn.entity.rebind.persister.ListeningObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.PersistenceObjectStore; -import org.apache.brooklyn.location.Location; import brooklyn.management.internal.ManagementContextInternal; 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/management/internal/AccessManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/internal/AccessManagerTest.java b/core/src/test/java/brooklyn/management/internal/AccessManagerTest.java index 59d92c7..34f733c 100644 --- a/core/src/test/java/brooklyn/management/internal/AccessManagerTest.java +++ b/core/src/test/java/brooklyn/management/internal/AccessManagerTest.java @@ -24,6 +24,8 @@ import static org.testng.Assert.assertTrue; 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.LocationSpec; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -33,9 +35,9 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.util.exceptions.Exceptions; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/management/internal/LocalManagementContextTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/internal/LocalManagementContextTest.java b/core/src/test/java/brooklyn/management/internal/LocalManagementContextTest.java index a648c74..d225cd7 100644 --- a/core/src/test/java/brooklyn/management/internal/LocalManagementContextTest.java +++ b/core/src/test/java/brooklyn/management/internal/LocalManagementContextTest.java @@ -25,6 +25,7 @@ import java.io.File; import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext.PropertiesReloadListener; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; @@ -33,7 +34,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynProperties.Factory.Builder; -import org.apache.brooklyn.location.Location; import brooklyn.util.os.Os; import com.google.common.base.Charsets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/qa/longevity/EntityCleanupLongevityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/qa/longevity/EntityCleanupLongevityTest.java b/core/src/test/java/brooklyn/qa/longevity/EntityCleanupLongevityTest.java index 6b8f87c..fc15ff3 100644 --- a/core/src/test/java/brooklyn/qa/longevity/EntityCleanupLongevityTest.java +++ b/core/src/test/java/brooklyn/qa/longevity/EntityCleanupLongevityTest.java @@ -19,9 +19,9 @@ package brooklyn.qa.longevity; import org.testng.annotations.Test; - -import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.util.javalang.JavaClassNames; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/qa/longevity/EntityCleanupLongevityTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/qa/longevity/EntityCleanupLongevityTestFixture.java b/core/src/test/java/brooklyn/qa/longevity/EntityCleanupLongevityTestFixture.java index 225dc08..f419101 100644 --- a/core/src/test/java/brooklyn/qa/longevity/EntityCleanupLongevityTestFixture.java +++ b/core/src/test/java/brooklyn/qa/longevity/EntityCleanupLongevityTestFixture.java @@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit; 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.LocationSpec; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -39,8 +40,9 @@ import brooklyn.entity.basic.Entities; import brooklyn.internal.storage.BrooklynStorage; import brooklyn.internal.storage.DataGrid; import brooklyn.internal.storage.impl.BrooklynStorageImpl; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.management.internal.AbstractManagementContext; 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/qa/longevity/EntityCleanupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/qa/longevity/EntityCleanupTest.java b/core/src/test/java/brooklyn/qa/longevity/EntityCleanupTest.java index 2313e08..70c1e1b 100644 --- a/core/src/test/java/brooklyn/qa/longevity/EntityCleanupTest.java +++ b/core/src/test/java/brooklyn/qa/longevity/EntityCleanupTest.java @@ -19,9 +19,9 @@ package brooklyn.qa.longevity; import org.testng.annotations.Test; - -import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.util.javalang.JavaClassNames; public class EntityCleanupTest extends EntityCleanupLongevityTestFixture { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/qa/performance/EntityPersistencePerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/qa/performance/EntityPersistencePerformanceTest.java b/core/src/test/java/brooklyn/qa/performance/EntityPersistencePerformanceTest.java index 1f8b669..8303062 100644 --- a/core/src/test/java/brooklyn/qa/performance/EntityPersistencePerformanceTest.java +++ b/core/src/test/java/brooklyn/qa/performance/EntityPersistencePerformanceTest.java @@ -23,6 +23,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.PerformanceTestUtils; @@ -30,8 +31,9 @@ import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.Test; import brooklyn.entity.rebind.RebindTestFixtureWithApp; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.test.policy.TestPolicy; import brooklyn.util.repeat.Repeater; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/test/HttpService.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/test/HttpService.java b/core/src/test/java/brooklyn/test/HttpService.java index 8a73541..2710211 100644 --- a/core/src/test/java/brooklyn/test/HttpService.java +++ b/core/src/test/java/brooklyn/test/HttpService.java @@ -19,6 +19,7 @@ package brooklyn.test; import org.apache.brooklyn.test.TestResourceUnavailableException; + import java.io.File; import java.io.InputStream; import java.net.InetAddress; @@ -38,9 +39,9 @@ import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.webapp.WebAppContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import org.apache.brooklyn.location.PortRange; +import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; + import brooklyn.util.ResourceUtils; import brooklyn.util.crypto.SecureKeys; import brooklyn.util.javalang.Threads; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/brooklyn/util/task/ssh/SshTasksTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/util/task/ssh/SshTasksTest.java b/core/src/test/java/brooklyn/util/task/ssh/SshTasksTest.java index 6fd7560..f5e0052 100644 --- a/core/src/test/java/brooklyn/util/task/ssh/SshTasksTest.java +++ b/core/src/test/java/brooklyn/util/task/ssh/SshTasksTest.java @@ -21,6 +21,7 @@ package brooklyn.util.task.ssh; import java.io.File; import java.io.IOException; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; @@ -32,9 +33,10 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.BrooklynConfigKeys; 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.management.internal.LocalManagementContext; import brooklyn.util.net.Urls; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolverTest.java index da69b24..541585f 100644 --- a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolverTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolverTest.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.location.access; -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.Assert; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerRebindTest.java b/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerRebindTest.java index 6645217..d36dec0 100644 --- a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerRebindTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerRebindTest.java @@ -25,8 +25,9 @@ import java.io.File; 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.api.location.LocationSpec; import org.apache.brooklyn.api.management.ha.MementoCopyMode; -import org.apache.brooklyn.location.Location; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; import org.slf4j.Logger; @@ -43,8 +44,9 @@ import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils; import brooklyn.entity.rebind.persister.FileBasedObjectStore; import brooklyn.entity.rebind.persister.PersistenceObjectStore; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.net.Networking; import brooklyn.util.os.Os; import brooklyn.util.text.Identifiers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerTest.java b/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerTest.java index 904e9dc..ef5cf93 100644 --- a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerTest.java @@ -34,8 +34,10 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.LocationSpec; + +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.net.Networking; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/AbstractLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/AbstractLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/AbstractLocationTest.java index 4977195..089b719 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/AbstractLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/AbstractLocationTest.java @@ -26,9 +26,9 @@ import static org.testng.Assert.assertTrue; import java.util.Collections; import java.util.Map; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java index 05b53b2..3cb5ab9 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java @@ -23,17 +23,19 @@ import static org.testng.Assert.fail; import java.util.Map; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.NoMachinesAvailableException; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.MachineProvisioningLocation; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; + 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/org/apache/brooklyn/location/basic/ByonLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/ByonLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/ByonLocationResolverTest.java index 141ab5d..09eb142 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/ByonLocationResolverTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/ByonLocationResolverTest.java @@ -30,9 +30,9 @@ import java.util.Set; import javax.annotation.Nullable; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.MachineProvisioningLocation; -import org.apache.brooklyn.location.NoMachinesAvailableException; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java index c4df75f..84cc898 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java @@ -25,8 +25,8 @@ import java.util.Set; import javax.annotation.Nullable; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.location.Location; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java index d689512..73ca57a 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java @@ -28,9 +28,9 @@ import java.util.List; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.NoMachinesAvailableException; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/HostLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/HostLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/HostLocationResolverTest.java index 2d66cb5..2ef938d 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/HostLocationResolverTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/HostLocationResolverTest.java @@ -25,7 +25,7 @@ import java.net.InetAddress; import java.util.Map; import java.util.NoSuchElementException; -import org.apache.brooklyn.location.MachineProvisioningLocation; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostLocationResolverTest.java index fd6f29c..704f5ac 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostLocationResolverTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostLocationResolverTest.java @@ -26,7 +26,8 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.Assert; import org.testng.annotations.AfterMethod; @@ -35,7 +36,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.NoMachinesAvailableException; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.text.StringEscapes.JavaStringEscapes; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java index d948eaf..2bd0d28 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java @@ -34,11 +34,13 @@ 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.MachineProvisioningLocation; -import org.apache.brooklyn.location.NoMachinesAvailableException; -import org.apache.brooklyn.location.PortRange; + +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; +import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.location.geo.HostGeoInfo; + import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostProvisioningAndAccessTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostProvisioningAndAccessTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostProvisioningAndAccessTest.java index fad4567..e1dff5e 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostProvisioningAndAccessTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostProvisioningAndAccessTest.java @@ -23,7 +23,7 @@ import static org.testng.Assert.assertTrue; import java.util.Arrays; -import org.apache.brooklyn.location.Location; +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/org/apache/brooklyn/location/basic/LocationConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigTest.java index b3e4f04..1f265fd 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigTest.java @@ -20,8 +20,8 @@ package org.apache.brooklyn.location.basic; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.location.LocationSpec; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.Assert; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/LocationExtensionsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocationExtensionsTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocationExtensionsTest.java index 1b5b743..4cbe0c4 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LocationExtensionsTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocationExtensionsTest.java @@ -23,9 +23,9 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/LocationManagementTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocationManagementTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocationManagementTest.java index be68557..5f6fa03 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LocationManagementTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocationManagementTest.java @@ -24,8 +24,8 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.LocationManager; -import org.apache.brooklyn.location.LocationSpec; 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/org/apache/brooklyn/location/basic/LocationPredicatesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocationPredicatesTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocationPredicatesTest.java index 3324477..219acd2 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LocationPredicatesTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocationPredicatesTest.java @@ -21,8 +21,8 @@ package org.apache.brooklyn.location.basic; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; +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.TestEntity; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/LocationRegistryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocationRegistryTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocationRegistryTest.java index ed8a96d..b1e01ca 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LocationRegistryTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocationRegistryTest.java @@ -18,7 +18,8 @@ */ package org.apache.brooklyn.location.basic; -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationDefinition; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +29,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.LocationDefinition; import brooklyn.management.internal.LocalManagementContext; public class LocationRegistryTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsTest.java index 7b36172..a3ce1d6 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsTest.java @@ -23,11 +23,11 @@ import static org.testng.Assert.assertNotNull; import java.util.Arrays; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineDetails; +import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.MachineDetails; -import org.apache.brooklyn.location.OsDetails; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationRebindTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationRebindTest.java index 25c2e9e..6d2e841 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationRebindTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationRebindTest.java @@ -22,9 +22,9 @@ import java.io.File; import java.util.List; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationResolverTest.java index 6fbf54e..8953397 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationResolverTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationResolverTest.java @@ -31,9 +31,10 @@ import java.util.NoSuchElementException; import javax.annotation.Nullable; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.NoMachinesAvailableException; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.Assert; @@ -43,7 +44,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.MachineProvisioningLocation; import brooklyn.management.internal.LocalManagementContext; 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/org/apache/brooklyn/location/basic/MultiLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationTest.java index 57d6c79..26423f5 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationTest.java @@ -29,9 +29,11 @@ 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.NoMachinesAvailableException; + +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; + import brooklyn.management.internal.LocalManagementContext; 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/org/apache/brooklyn/location/basic/PortRangesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/PortRangesTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/PortRangesTest.java index 3e4812f..2b7ab69 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/PortRangesTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/PortRangesTest.java @@ -24,8 +24,8 @@ import java.util.Iterator; import org.testng.Assert; import org.testng.annotations.Test; +import org.apache.brooklyn.api.location.PortRange; -import org.apache.brooklyn.location.PortRange; import brooklyn.util.flags.TypeCoercions; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/RecordingMachineLocationCustomizer.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/RecordingMachineLocationCustomizer.java b/core/src/test/java/org/apache/brooklyn/location/basic/RecordingMachineLocationCustomizer.java index a30d6e1..53e261f 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/RecordingMachineLocationCustomizer.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/RecordingMachineLocationCustomizer.java @@ -26,8 +26,8 @@ import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.MachineLocationCustomizer; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.MachineLocationCustomizer; public class RecordingMachineLocationCustomizer implements MachineLocationCustomizer { public static class Call { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/SimulatedLocation.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/SimulatedLocation.java b/core/src/test/java/org/apache/brooklyn/location/basic/SimulatedLocation.java index c904619..fdbcf1c 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/SimulatedLocation.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/SimulatedLocation.java @@ -23,14 +23,15 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.brooklyn.location.HardwareDetails; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.MachineDetails; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.MachineProvisioningLocation; -import org.apache.brooklyn.location.OsDetails; -import org.apache.brooklyn.location.PortRange; -import org.apache.brooklyn.location.PortSupplier; +import org.apache.brooklyn.api.location.HardwareDetails; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineDetails; +import org.apache.brooklyn.api.location.MachineLocation; +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.api.location.PortSupplier; + import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java index 27731e5..1fef80b 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java @@ -32,7 +32,9 @@ 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.api.location.LocationSpec; + 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/org/apache/brooklyn/location/basic/SshMachineLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationTest.java index 37f3b32..b4ee5ef 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationTest.java @@ -37,12 +37,12 @@ import org.apache.brooklyn.api.entity.Effector; 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.Location; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineDetails; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.MachineDetails; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.PortRange; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/location/geo/HostGeoInfoTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/geo/HostGeoInfoTest.java b/core/src/test/java/org/apache/brooklyn/location/geo/HostGeoInfoTest.java index f288bee..173acf8 100644 --- a/core/src/test/java/org/apache/brooklyn/location/geo/HostGeoInfoTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/geo/HostGeoInfoTest.java @@ -21,7 +21,7 @@ package org.apache.brooklyn.location.geo; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNotNull; -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.location.basic.SimulatedLocation; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/test/entity/BlockingEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/test/entity/BlockingEntityImpl.java b/core/src/test/java/org/apache/brooklyn/test/entity/BlockingEntityImpl.java index 8dbb21d..3e1ad87 100644 --- a/core/src/test/java/org/apache/brooklyn/test/entity/BlockingEntityImpl.java +++ b/core/src/test/java/org/apache/brooklyn/test/entity/BlockingEntityImpl.java @@ -21,7 +21,7 @@ package org.apache.brooklyn.test.entity; import java.util.Collection; import java.util.concurrent.CountDownLatch; -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/test/entity/TestApplicationImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/test/entity/TestApplicationImpl.java b/core/src/test/java/org/apache/brooklyn/test/entity/TestApplicationImpl.java index 33c52ed..697577a 100644 --- a/core/src/test/java/org/apache/brooklyn/test/entity/TestApplicationImpl.java +++ b/core/src/test/java/org/apache/brooklyn/test/entity/TestApplicationImpl.java @@ -25,14 +25,16 @@ import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.SubscriptionHandle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractApplication; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SimulatedLocation; + import brooklyn.util.logging.LoggingSetup; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/core/src/test/java/org/apache/brooklyn/test/entity/TestEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/test/entity/TestEntityImpl.java b/core/src/test/java/org/apache/brooklyn/test/entity/TestEntityImpl.java index c444b51..44bc11a 100644 --- a/core/src/test/java/org/apache/brooklyn/test/entity/TestEntityImpl.java +++ b/core/src/test/java/org/apache/brooklyn/test/entity/TestEntityImpl.java @@ -28,13 +28,13 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.ServiceStateLogic; -import org.apache.brooklyn.location.Location; import brooklyn.util.collections.MutableMap; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java index 9c3edad..6f9bdea 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java @@ -31,6 +31,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.entity.nosql.cassandra.CassandraDatacenter; import org.apache.brooklyn.entity.nosql.cassandra.CassandraFabric; import org.apache.brooklyn.entity.nosql.cassandra.CassandraNode; @@ -56,9 +57,8 @@ import brooklyn.event.basic.DependentConfiguration; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.PolicySpec; - -import org.apache.brooklyn.location.Location; import org.apache.brooklyn.location.basic.PortRanges; + import brooklyn.policy.ha.ServiceFailureDetector; import brooklyn.policy.ha.ServiceReplacer; import brooklyn.policy.ha.ServiceRestarter; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java b/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java index 900ba4a..1755cf7 100644 --- a/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java +++ b/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java @@ -20,6 +20,7 @@ package org.apache.brooklyn.demo; 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.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; @@ -55,7 +56,6 @@ import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.java.JavaEntityMethods; import brooklyn.entity.rebind.RebindOptions; import brooklyn.entity.rebind.RebindTestFixture; -import org.apache.brooklyn.location.Location; import brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/main/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicy.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicy.java b/locations/jclouds/src/main/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicy.java index bd02f60..266f738 100644 --- a/locations/jclouds/src/main/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicy.java +++ b/locations/jclouds/src/main/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicy.java @@ -23,13 +23,15 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; 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.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractEntity; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.WinRmMachineLocation; + import brooklyn.policy.basic.AbstractPolicy; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/main/java/brooklyn/policy/os/CreateUserPolicy.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/brooklyn/policy/os/CreateUserPolicy.java b/locations/jclouds/src/main/java/brooklyn/policy/os/CreateUserPolicy.java index 4e2f68c..bc8eab1 100644 --- a/locations/jclouds/src/main/java/brooklyn/policy/os/CreateUserPolicy.java +++ b/locations/jclouds/src/main/java/brooklyn/policy/os/CreateUserPolicy.java @@ -25,6 +25,7 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; 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.jclouds.compute.config.AdminAccessConfiguration; import org.jclouds.scriptbuilder.functions.InitAdminAccess; import org.jclouds.scriptbuilder.statements.login.AdminAccess; @@ -37,8 +38,9 @@ import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.flags.SetFromFlag; import brooklyn.util.internal.ssh.SshTool; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynMachinePool.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynMachinePool.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynMachinePool.java index e857e93..fa71a3a 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynMachinePool.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynMachinePool.java @@ -26,17 +26,19 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.management.Task; import org.jclouds.compute.domain.NodeMetadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.trait.Startable; -import org.apache.brooklyn.location.MachineLocation; + import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.jclouds.pool.MachinePool; import org.apache.brooklyn.location.jclouds.pool.MachineSet; import org.apache.brooklyn.location.jclouds.pool.ReusableMachineTemplate; + import brooklyn.util.collections.MutableMap; import brooklyn.util.task.BasicExecutionContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolver.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolver.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolver.java index 5aa026d..e8f63b3 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolver.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolver.java @@ -25,21 +25,21 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +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.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.location.LocationRegistry; import org.apache.brooklyn.api.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import org.apache.brooklyn.location.LocationResolver; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.NoMachinesAvailableException; import org.apache.brooklyn.location.basic.BasicLocationRegistry; import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; import org.apache.brooklyn.location.basic.LocationConfigKeys; import org.apache.brooklyn.location.basic.LocationConfigUtils; import org.apache.brooklyn.location.basic.LocationInternal; import org.apache.brooklyn.location.basic.LocationPropertiesFromBrooklynProperties; + import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java index d355721..2583234 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java @@ -51,10 +51,12 @@ import java.util.regex.Pattern; import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.MachineLocationCustomizer; +import org.apache.brooklyn.api.location.MachineManagementMixins; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.AccessController; -import org.apache.brooklyn.location.MachineLocationCustomizer; -import org.apache.brooklyn.location.MachineManagementMixins; -import org.apache.brooklyn.location.NoMachinesAvailableException; import org.apache.brooklyn.location.access.PortMapping; import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.cloud.AbstractCloudMachineProvisioningLocation; @@ -131,8 +133,7 @@ import brooklyn.entity.basic.Sanitizer; import brooklyn.entity.rebind.persister.LocationWithObjectStore; import brooklyn.entity.rebind.persister.PersistenceObjectStore; import brooklyn.entity.rebind.persister.jclouds.JcloudsBlobStoreBasedObjectStore; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.MachineLocation; + import org.apache.brooklyn.location.access.PortForwardManager; import org.apache.brooklyn.location.basic.BasicMachineMetadata; import org.apache.brooklyn.location.basic.LocationConfigKeys; @@ -144,6 +145,7 @@ import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; import org.apache.brooklyn.location.cloud.names.CloudMachineNamer; import org.apache.brooklyn.location.jclouds.JcloudsPredicates.NodeInLocation; import org.apache.brooklyn.location.jclouds.templates.PortableTemplateBuilder; + 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/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolver.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolver.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolver.java index 1ca33c2..cf5335f 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolver.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolver.java @@ -25,10 +25,10 @@ import java.util.Collection; import java.util.Map; import java.util.NoSuchElementException; +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.LocationRegistry; -import org.apache.brooklyn.location.LocationResolver; -import org.apache.brooklyn.location.LocationSpec; import org.apache.brooklyn.location.basic.LocationConfigKeys; import org.apache.brooklyn.location.basic.LocationConfigUtils; import org.apache.brooklyn.location.basic.LocationInternal; @@ -38,8 +38,8 @@ import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.Providers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.location.basic.BasicLocationRegistry; + import brooklyn.util.text.Strings; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java index 2619206..11d20ef 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java @@ -18,12 +18,11 @@ */ package org.apache.brooklyn.location.jclouds; +import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.location.basic.HasSubnetHostname; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.Template; -import org.apache.brooklyn.location.MachineLocation; - public interface JcloudsMachineLocation extends MachineLocation, HasSubnetHostname { @Override http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java index 08fd3b0..a2a5735 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java @@ -31,9 +31,9 @@ import java.util.concurrent.TimeoutException; import javax.annotation.Nullable; -import org.apache.brooklyn.location.HardwareDetails; -import org.apache.brooklyn.location.MachineDetails; -import org.apache.brooklyn.location.OsDetails; +import org.apache.brooklyn.api.location.HardwareDetails; +import org.apache.brooklyn.api.location.MachineDetails; +import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.location.basic.BasicHardwareDetails; import org.apache.brooklyn.location.basic.BasicMachineDetails; import org.apache.brooklyn.location.basic.BasicOsDetails; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtension.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtension.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtension.java index dcb6b4c..f62e6e4 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtension.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtension.java @@ -24,12 +24,11 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; import java.util.Set; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.location.Location; import org.apache.brooklyn.location.cloud.AbstractAvailabilityZoneExtension; import org.jclouds.aws.ec2.AWSEC2Api; import org.jclouds.ec2.domain.AvailabilityZoneInfo; - import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; import org.apache.brooklyn.location.jclouds.JcloudsLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver b/locations/jclouds/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver new file mode 100644 index 0000000..cef522c --- /dev/null +++ b/locations/jclouds/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver @@ -0,0 +1,20 @@ +# +# 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.jclouds.JcloudsLocationResolver +org.apache.brooklyn.location.jclouds.JcloudsByonLocationResolver http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/main/resources/META-INF/services/org.apache.brooklyn.location.LocationResolver ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/resources/META-INF/services/org.apache.brooklyn.location.LocationResolver b/locations/jclouds/src/main/resources/META-INF/services/org.apache.brooklyn.location.LocationResolver deleted file mode 100644 index e29b717..0000000 --- a/locations/jclouds/src/main/resources/META-INF/services/org.apache.brooklyn.location.LocationResolver +++ /dev/null @@ -1,2 +0,0 @@ -org.apache.brooklyn.location.jclouds.JcloudsLocationResolver -org.apache.brooklyn.location.jclouds.JcloudsByonLocationResolver http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/test/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicyTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicyTest.java b/locations/jclouds/src/test/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicyTest.java index 3973ade..37f46c9 100644 --- a/locations/jclouds/src/test/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicyTest.java +++ b/locations/jclouds/src/test/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicyTest.java @@ -19,13 +19,14 @@ package brooklyn.policy.os; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.WinRmMachineLocation; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java b/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java index fe77f5e..78817df 100644 --- a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java +++ b/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java @@ -25,6 +25,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; 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.MachineProvisioningLocation; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; @@ -33,11 +36,10 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppLiveTestSupport; -import org.apache.brooklyn.location.Location; -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.internal.ssh.SshTool; import brooklyn.util.text.Identifiers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java b/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java index 4184163..42fafd8 100644 --- a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java +++ b/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java @@ -27,6 +27,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; @@ -37,8 +38,9 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import org.apache.brooklyn.location.LocationSpec; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.internal.ssh.SshTool; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java index acf838e..7892c8e 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java @@ -24,8 +24,8 @@ import java.util.Map; import javax.annotation.Nullable; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.location.LocationSpec; import org.jclouds.compute.ComputeService; import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.Template; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsAddressesLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsAddressesLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsAddressesLiveTest.java index 2694ed5..e24d070 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsAddressesLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsAddressesLiveTest.java @@ -28,7 +28,7 @@ import java.net.InetAddress; import java.util.Map; import java.util.Set; -import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationMetadataTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationMetadataTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationMetadataTest.java index 7bce1ab..3c3d4a5 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationMetadataTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationMetadataTest.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.location.jclouds; import static org.testng.Assert.assertEquals; -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -28,7 +28,9 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.location.basic.LocationConfigKeys; + import brooklyn.management.internal.LocalManagementContext; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java index 4c5788f..100f98a 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java @@ -27,7 +27,10 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Nullable; -import org.apache.brooklyn.location.MachineLocationCustomizer; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.MachineLocationCustomizer; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.location.cloud.names.CustomMachineNamer; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.jclouds.scriptbuilder.domain.OsFamily; @@ -50,12 +53,11 @@ import brooklyn.config.BrooklynProperties; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.MachineLocation; -import org.apache.brooklyn.location.NoMachinesAvailableException; + import org.apache.brooklyn.location.basic.LocationConfigKeys; import org.apache.brooklyn.location.geo.HostGeoInfo; import org.apache.brooklyn.location.jclouds.JcloudsLocation.UserCreation; + import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap;