http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java index 19a5058..0018dd0 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java @@ -35,8 +35,11 @@ import org.testng.annotations.Test; import brooklyn.camp.lite.CampPlatformWithJustBrooklynMgmt; import brooklyn.camp.lite.TestAppAssemblyInstantiator; + import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.catalog.CatalogItem.CatalogItemType; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.catalog.internal.BasicBrooklynCatalog; import brooklyn.catalog.internal.CatalogDto; import brooklyn.config.BrooklynProperties; @@ -44,7 +47,6 @@ import brooklyn.config.BrooklynServerConfig; import brooklyn.entity.proxying.EntitySpec; import brooklyn.internal.BrooklynFeatureEnablement; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.test.entity.TestEntity;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java index 1046c1b..8630236 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java @@ -35,6 +35,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Semaphore; +import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.brooklyn.mementos.BrooklynMementoManifest; import org.apache.brooklyn.mementos.EntityMemento; import org.testng.Assert; @@ -66,7 +67,6 @@ import brooklyn.event.basic.Sensors; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocationConfigTest.MyLocation; -import brooklyn.management.ha.ManagementNodeState; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java index 5b0710b..6287224 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java @@ -27,6 +27,8 @@ import java.io.File; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.management.EntityManager; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.Policy; @@ -47,8 +49,6 @@ import brooklyn.entity.rebind.RebindEntityTest.MyEntityImpl; import brooklyn.entity.rebind.RebindManager.RebindFailureMode; import brooklyn.entity.trait.Identifiable; import brooklyn.event.AttributeSensor; -import brooklyn.management.EntityManager; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java index 25ea808..db6e500 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java @@ -25,6 +25,8 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.Callable; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,8 +38,6 @@ import org.testng.annotations.Test; import brooklyn.entity.Feed; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; -import brooklyn.management.Task; -import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java index a670893..c62364d 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.mementos.EntityMemento; import org.apache.brooklyn.mementos.TreeNode; import org.testng.annotations.AfterMethod; @@ -37,7 +38,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.dto.MementosGenerators; import brooklyn.entity.trait.Identifiable; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java index 00e2a36..e018d75 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java @@ -22,11 +22,11 @@ import static org.testng.Assert.assertEquals; import java.util.concurrent.Callable; +import org.apache.brooklyn.management.Task; import org.testng.annotations.Test; import brooklyn.entity.Entity; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.management.Task; import brooklyn.test.entity.TestEntity; import brooklyn.test.entity.TestEntityImpl; import brooklyn.util.task.BasicTask; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/RebindOptions.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindOptions.java b/core/src/test/java/brooklyn/entity/rebind/RebindOptions.java index 0cc1f8c..6a9e4b0 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindOptions.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindOptions.java @@ -20,8 +20,9 @@ package brooklyn.entity.rebind; import java.io.File; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.entity.rebind.persister.PersistenceObjectStore; -import brooklyn.management.ManagementContext; /** * See {@link RebindTestFixture#rebind(RebindOptions)} and {@link RebindTestUtils#rebind(RebindOptions)}. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java b/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java index 0045711..e7a8ee7 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java @@ -33,6 +33,9 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.apache.brooklyn.catalog.BrooklynCatalog; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.mementos.BrooklynMementoManifest; import brooklyn.catalog.internal.CatalogUtils; @@ -44,9 +47,6 @@ import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.FileBasedObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.trait.Startable; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; -import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java b/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java index 778dbd7..141a699 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java @@ -27,6 +27,9 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeoutException; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.brooklyn.mementos.BrooklynMemento; import org.apache.brooklyn.mementos.BrooklynMementoRawData; import org.slf4j.Logger; @@ -44,9 +47,6 @@ import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.PersistenceObjectStore; import brooklyn.entity.trait.Identifiable; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.HighAvailabilityMode; -import brooklyn.management.ha.ManagementNodeState; import brooklyn.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.internal.ManagementContextInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterFileBasedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterFileBasedTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterFileBasedTest.java index 89afd4a..50b79b7 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterFileBasedTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterFileBasedTest.java @@ -20,11 +20,11 @@ package brooklyn.entity.rebind.persister; import java.io.File; +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; import brooklyn.entity.rebind.RebindTestUtils; -import brooklyn.management.ManagementContext; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.os.Os; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java index 14545b4..dd0ddf7 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java @@ -21,13 +21,13 @@ package brooklyn.entity.rebind.persister; import java.io.IOException; import java.util.concurrent.TimeoutException; +import org.apache.brooklyn.management.ManagementContext; import org.testng.Assert; import org.testng.annotations.Test; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.entity.rebind.persister.ListeningObjectStore.RecordingTransactionListener; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.TestEntity; import brooklyn.util.text.Identifiers; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemoryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemoryTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemoryTest.java index d4dc0f4..386b521 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemoryTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemoryTest.java @@ -18,10 +18,10 @@ */ package brooklyn.entity.rebind.persister; +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.Test; import brooklyn.entity.rebind.RebindTestUtils; -import brooklyn.management.ManagementContext; import brooklyn.util.time.Duration; @Test http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java index 375b83c..58b7cd1 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.mementos.BrooklynMemento; import org.apache.brooklyn.mementos.BrooklynMementoPersister; import org.apache.brooklyn.mementos.BrooklynMementoRawData; @@ -47,7 +48,6 @@ import brooklyn.entity.rebind.RecordingRebindExceptionHandler; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; import brooklyn.test.policy.TestPolicy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/persister/FileBasedObjectStoreTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/FileBasedObjectStoreTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/FileBasedObjectStoreTest.java index 291f3a8..a94960a 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/FileBasedObjectStoreTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/FileBasedObjectStoreTest.java @@ -25,12 +25,12 @@ import static org.testng.Assert.assertTrue; import java.io.File; import java.io.FileNotFoundException; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.io.FileUtil; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/persister/InMemoryObjectStore.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/InMemoryObjectStore.java b/core/src/test/java/brooklyn/entity/rebind/persister/InMemoryObjectStore.java index a5c7cc6..ee75b64 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/InMemoryObjectStore.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/InMemoryObjectStore.java @@ -22,11 +22,11 @@ import java.util.Date; import java.util.List; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/persister/ListeningObjectStore.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/ListeningObjectStore.java b/core/src/test/java/brooklyn/entity/rebind/persister/ListeningObjectStore.java index c5ac4ff..37679e2 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/ListeningObjectStore.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/ListeningObjectStore.java @@ -24,11 +24,11 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.util.collections.MutableList; import brooklyn.util.text.Strings; import brooklyn.util.time.CountdownTimer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java index 2d3b09a..d77b204 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java @@ -32,6 +32,7 @@ import java.util.Set; import brooklyn.management.osgi.OsgiTestResources; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; @@ -56,7 +57,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.BrooklynObjectType; import brooklyn.location.Location; import brooklyn.location.LocationSpec; -import brooklyn.management.ManagementContext; import brooklyn.management.osgi.OsgiVersionMoreEntityTest; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java b/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java index f8069df..f8471c2 100644 --- a/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java @@ -25,6 +25,8 @@ import java.io.File; import javax.annotation.Nullable; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.mementos.BrooklynMementoRawData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,8 +49,6 @@ import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.FileBasedObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.test.entity.TestApplication; import brooklyn.util.guava.SerializablePredicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java b/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java index a5f3a0f..ec115ba 100644 --- a/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java +++ b/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java @@ -20,11 +20,11 @@ package brooklyn.entity.trait; import java.util.Collection; +import org.apache.brooklyn.management.Task; import org.testng.Assert; import brooklyn.entity.basic.Entities; import brooklyn.location.Location; -import brooklyn.management.Task; import brooklyn.test.entity.TestEntityImpl; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.task.Tasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java b/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java index 8a50a3a..2c84325 100644 --- a/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java +++ b/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.trait; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; +import org.apache.brooklyn.management.Task; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -29,7 +30,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.FailingEntity.RecordingEventListener; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.management.Task; import brooklyn.test.entity.TestEntity; import brooklyn.util.task.Tasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java b/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java index 2d4b326..ec7cf72 100644 --- a/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java +++ b/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertNotEquals; import java.io.File; +import org.apache.brooklyn.management.ha.MementoCopyMode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -42,7 +43,6 @@ import brooklyn.event.basic.Sensors; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.ha.MementoCopyMode; import brooklyn.test.entity.TestEntity; import brooklyn.test.entity.TestEntityImpl; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/location/basic/AbstractLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/AbstractLocationTest.java b/core/src/test/java/brooklyn/location/basic/AbstractLocationTest.java index 0861b76..c031d8c 100644 --- a/core/src/test/java/brooklyn/location/basic/AbstractLocationTest.java +++ b/core/src/test/java/brooklyn/location/basic/AbstractLocationTest.java @@ -26,6 +26,7 @@ import static org.testng.Assert.assertTrue; import java.util.Collections; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -33,7 +34,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.location.Location; import brooklyn.location.LocationSpec; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java b/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java index 994dfea..b2c745d 100644 --- a/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java +++ b/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java @@ -25,6 +25,7 @@ import java.util.Set; import javax.annotation.Nullable; +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -33,7 +34,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableSet; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/location/basic/LocationConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/LocationConfigTest.java b/core/src/test/java/brooklyn/location/basic/LocationConfigTest.java index a7ba743..21b001d 100644 --- a/core/src/test/java/brooklyn/location/basic/LocationConfigTest.java +++ b/core/src/test/java/brooklyn/location/basic/LocationConfigTest.java @@ -20,6 +20,7 @@ package brooklyn.location.basic; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -28,7 +29,6 @@ import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.location.LocationSpec; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/location/basic/LocationExtensionsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/LocationExtensionsTest.java b/core/src/test/java/brooklyn/location/basic/LocationExtensionsTest.java index 974fbfb..43024ac 100644 --- a/core/src/test/java/brooklyn/location/basic/LocationExtensionsTest.java +++ b/core/src/test/java/brooklyn/location/basic/LocationExtensionsTest.java @@ -25,9 +25,9 @@ import static org.testng.Assert.fail; import brooklyn.entity.basic.Entities; import brooklyn.location.Location; import brooklyn.location.LocationSpec; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.management.ManagementContext; 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/f7f03580/core/src/test/java/brooklyn/location/basic/LocationManagementTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/LocationManagementTest.java b/core/src/test/java/brooklyn/location/basic/LocationManagementTest.java index 3b86be5..dbf24e1 100644 --- a/core/src/test/java/brooklyn/location/basic/LocationManagementTest.java +++ b/core/src/test/java/brooklyn/location/basic/LocationManagementTest.java @@ -24,12 +24,12 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.management.LocationManager; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.location.LocationSpec; -import brooklyn.management.LocationManager; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/location/basic/MachineDetailsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/MachineDetailsTest.java b/core/src/test/java/brooklyn/location/basic/MachineDetailsTest.java index c6f3685..2ba0560 100644 --- a/core/src/test/java/brooklyn/location/basic/MachineDetailsTest.java +++ b/core/src/test/java/brooklyn/location/basic/MachineDetailsTest.java @@ -23,6 +23,8 @@ import static org.testng.Assert.assertNotNull; import java.util.Arrays; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -33,8 +35,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.location.LocationSpec; import brooklyn.location.MachineDetails; import brooklyn.location.OsDetails; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; import brooklyn.test.entity.TestApplication; public class MachineDetailsTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java b/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java index 194d176..239be4b 100644 --- a/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java +++ b/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java @@ -21,6 +21,7 @@ package brooklyn.location.basic; import java.io.File; import java.util.List; +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,7 +33,6 @@ import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.cloud.AvailabilityZoneExtension; -import brooklyn.management.ManagementContext; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/location/basic/SshMachineLocationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/SshMachineLocationIntegrationTest.java b/core/src/test/java/brooklyn/location/basic/SshMachineLocationIntegrationTest.java index 1c0e570..60ad222 100644 --- a/core/src/test/java/brooklyn/location/basic/SshMachineLocationIntegrationTest.java +++ b/core/src/test/java/brooklyn/location/basic/SshMachineLocationIntegrationTest.java @@ -24,15 +24,17 @@ import java.util.Arrays; import java.util.Map; import brooklyn.util.internal.ssh.SshTool; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; + +import org.apache.brooklyn.management.ManagementContext; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java b/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java index 61dc65e..17d6ee2 100644 --- a/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java +++ b/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; +import org.apache.brooklyn.management.ManagementContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -53,7 +54,6 @@ import brooklyn.location.MachineDetails; import brooklyn.location.MachineLocation; import brooklyn.location.PortRange; import brooklyn.location.basic.PortRanges.LinearPortRange; -import brooklyn.management.ManagementContext; import brooklyn.test.Asserts; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManager.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManager.java b/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManager.java index c7e5405..ef39d71 100644 --- a/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManager.java +++ b/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManager.java @@ -18,6 +18,10 @@ */ package brooklyn.management.entitlement; +import org.apache.brooklyn.management.entitlement.EntitlementClass; +import org.apache.brooklyn.management.entitlement.EntitlementContext; +import org.apache.brooklyn.management.entitlement.EntitlementManager; + public class AcmeEntitlementManager extends PerUserEntitlementManager { public AcmeEntitlementManager() { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 a8f0261..1e64590 100644 --- a/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java +++ b/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java @@ -21,6 +21,7 @@ package brooklyn.management.entitlement; import java.io.IOException; import java.net.URI; +import org.apache.brooklyn.management.ManagementContext; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -35,7 +36,6 @@ import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.NotEntitledException; import brooklyn.management.entitlement.WebEntitlementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java b/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java index 3e6b207..174e150 100644 --- a/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java +++ b/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java @@ -21,6 +21,8 @@ package brooklyn.management.entitlement; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.entitlement.EntitlementManager; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -31,7 +33,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.management.ManagementContext; import brooklyn.management.entitlement.Entitlements.EntityAndItem; import brooklyn.management.entitlement.Entitlements.StringAndArgument; import brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 d380e6f..1f253e6 100644 --- a/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java +++ b/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java @@ -18,6 +18,7 @@ */ package brooklyn.management.entitlement; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -33,7 +34,6 @@ import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; 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/f7f03580/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 c8b03b8..1a0cf4b 100644 --- a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerInMemoryTest.java +++ b/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerInMemoryTest.java @@ -21,6 +21,7 @@ package brooklyn.management.ha; import java.util.Collection; import java.util.List; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 934090c..a6275cc 100644 --- a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerSplitBrainTest.java +++ b/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerSplitBrainTest.java @@ -27,6 +27,11 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecordPersister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerTestFixture.java b/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerTestFixture.java index e1ecad7..69f5b09 100644 --- a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerTestFixture.java +++ b/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerTestFixture.java @@ -27,6 +27,11 @@ import static org.testng.Assert.assertTrue; import java.util.List; import java.util.concurrent.atomic.AtomicLong; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecordPersister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 2259db4..096fcf7 100644 --- a/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java +++ b/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java @@ -29,6 +29,9 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecordPersister; 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/f7f03580/core/src/test/java/brooklyn/management/ha/ImmutableManagementPlaneSyncRecord.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/ha/ImmutableManagementPlaneSyncRecord.java b/core/src/test/java/brooklyn/management/ha/ImmutableManagementPlaneSyncRecord.java index 28382e0..bafc19a 100644 --- a/core/src/test/java/brooklyn/management/ha/ImmutableManagementPlaneSyncRecord.java +++ b/core/src/test/java/brooklyn/management/ha/ImmutableManagementPlaneSyncRecord.java @@ -20,6 +20,9 @@ package brooklyn.management.ha; import java.util.Map; +import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; + import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/management/ha/ManagementPlaneSyncRecordPersisterInMemory.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/ha/ManagementPlaneSyncRecordPersisterInMemory.java b/core/src/test/java/brooklyn/management/ha/ManagementPlaneSyncRecordPersisterInMemory.java index 7ae681e..2e0eeb0 100644 --- a/core/src/test/java/brooklyn/management/ha/ManagementPlaneSyncRecordPersisterInMemory.java +++ b/core/src/test/java/brooklyn/management/ha/ManagementPlaneSyncRecordPersisterInMemory.java @@ -23,6 +23,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.io.IOException; import java.util.concurrent.TimeoutException; +import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecordPersister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/management/ha/MasterChooserTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/ha/MasterChooserTest.java b/core/src/test/java/brooklyn/management/ha/MasterChooserTest.java index 4373ea0..fedc040 100644 --- a/core/src/test/java/brooklyn/management/ha/MasterChooserTest.java +++ b/core/src/test/java/brooklyn/management/ha/MasterChooserTest.java @@ -23,6 +23,8 @@ import static org.testng.Assert.assertNull; import java.util.List; +import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/management/ha/MutableManagementPlaneSyncRecord.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/ha/MutableManagementPlaneSyncRecord.java b/core/src/test/java/brooklyn/management/ha/MutableManagementPlaneSyncRecord.java index de3e741..a0a1496 100644 --- a/core/src/test/java/brooklyn/management/ha/MutableManagementPlaneSyncRecord.java +++ b/core/src/test/java/brooklyn/management/ha/MutableManagementPlaneSyncRecord.java @@ -20,6 +20,9 @@ package brooklyn.management.ha; import java.util.Map; +import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; + import com.google.common.collect.Maps; public class MutableManagementPlaneSyncRecord implements ManagementPlaneSyncRecord { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 fb10caa..ad59a4b 100644 --- a/core/src/test/java/brooklyn/management/ha/WarmStandbyTest.java +++ b/core/src/test/java/brooklyn/management/ha/WarmStandbyTest.java @@ -24,6 +24,9 @@ import java.util.Date; import java.util.List; import java.util.Map; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecordPersister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/management/internal/EntityExecutionManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/internal/EntityExecutionManagerTest.java b/core/src/test/java/brooklyn/management/internal/EntityExecutionManagerTest.java index 896a061..28d5779 100644 --- a/core/src/test/java/brooklyn/management/internal/EntityExecutionManagerTest.java +++ b/core/src/test/java/brooklyn/management/internal/EntityExecutionManagerTest.java @@ -30,6 +30,8 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.Semaphore; +import org.apache.brooklyn.management.ExecutionManager; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -46,8 +48,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.BasicAttributeSensor; -import brooklyn.management.ExecutionManager; -import brooklyn.management.Task; import brooklyn.test.Asserts; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 be29a73..eacf666 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.management.ManagementContext.PropertiesReloadListener; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,7 +33,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynProperties.Factory.Builder; import brooklyn.location.Location; -import brooklyn.management.ManagementContext.PropertiesReloadListener; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/management/internal/LocalSubscriptionManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/internal/LocalSubscriptionManagerTest.java b/core/src/test/java/brooklyn/management/internal/LocalSubscriptionManagerTest.java index e671f46..a03838d 100644 --- a/core/src/test/java/brooklyn/management/internal/LocalSubscriptionManagerTest.java +++ b/core/src/test/java/brooklyn/management/internal/LocalSubscriptionManagerTest.java @@ -27,6 +27,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.management.SubscriptionHandle; +import org.apache.brooklyn.management.SubscriptionManager; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -37,8 +39,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.management.SubscriptionHandle; -import brooklyn.management.SubscriptionManager; import brooklyn.test.entity.TestEntity; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java b/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java index 3360290..02327c7 100644 --- a/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java +++ b/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java @@ -47,11 +47,11 @@ import brooklyn.entity.effector.Effectors; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.proxying.InternalEntityFactory; import brooklyn.entity.proxying.InternalPolicyFactory; -import brooklyn.management.ManagementContext; -import brooklyn.management.classloading.BrooklynClassLoadingContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.internal.ManagementContextInternal; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.TestResourceUnavailableException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/policy/basic/PolicySubscriptionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/policy/basic/PolicySubscriptionTest.java b/core/src/test/java/brooklyn/policy/basic/PolicySubscriptionTest.java index ed2bc47..6952396 100644 --- a/core/src/test/java/brooklyn/policy/basic/PolicySubscriptionTest.java +++ b/core/src/test/java/brooklyn/policy/basic/PolicySubscriptionTest.java @@ -24,11 +24,13 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; + import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.management.SubscriptionHandle; + import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.BasicSensorEvent; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.management.SubscriptionHandle; import brooklyn.test.Asserts; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/qa/performance/AbstractPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/qa/performance/AbstractPerformanceTest.java b/core/src/test/java/brooklyn/qa/performance/AbstractPerformanceTest.java index f287ebd..f3595e5 100644 --- a/core/src/test/java/brooklyn/qa/performance/AbstractPerformanceTest.java +++ b/core/src/test/java/brooklyn/qa/performance/AbstractPerformanceTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -30,7 +31,6 @@ import org.testng.annotations.BeforeMethod; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.TestApplication; import brooklyn.util.internal.DoubleSystemProperty; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/qa/performance/EntityPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/qa/performance/EntityPerformanceTest.java b/core/src/test/java/brooklyn/qa/performance/EntityPerformanceTest.java index d4d276f..dab9afd 100644 --- a/core/src/test/java/brooklyn/qa/performance/EntityPerformanceTest.java +++ b/core/src/test/java/brooklyn/qa/performance/EntityPerformanceTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertTrue; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.management.Task; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -30,7 +31,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.management.Task; import brooklyn.test.Asserts; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/qa/performance/SubscriptionPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/qa/performance/SubscriptionPerformanceTest.java b/core/src/test/java/brooklyn/qa/performance/SubscriptionPerformanceTest.java index f91316f..57f3361 100644 --- a/core/src/test/java/brooklyn/qa/performance/SubscriptionPerformanceTest.java +++ b/core/src/test/java/brooklyn/qa/performance/SubscriptionPerformanceTest.java @@ -26,13 +26,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.management.SubscriptionManager; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.management.SubscriptionManager; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/test/entity/TestApplication.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/test/entity/TestApplication.java b/core/src/test/java/brooklyn/test/entity/TestApplication.java index f771958..441359a 100644 --- a/core/src/test/java/brooklyn/test/entity/TestApplication.java +++ b/core/src/test/java/brooklyn/test/entity/TestApplication.java @@ -20,6 +20,8 @@ package brooklyn.test.entity; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.entity.Entity; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.EntityInternal; @@ -30,7 +32,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.management.ManagementContext; /** * Mock application for testing. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/test/entity/TestApplicationImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/test/entity/TestApplicationImpl.java b/core/src/test/java/brooklyn/test/entity/TestApplicationImpl.java index 4eaf2d9..584c51c 100644 --- a/core/src/test/java/brooklyn/test/entity/TestApplicationImpl.java +++ b/core/src/test/java/brooklyn/test/entity/TestApplicationImpl.java @@ -20,6 +20,7 @@ package brooklyn.test.entity; import java.util.Map; +import org.apache.brooklyn.management.SubscriptionHandle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +33,6 @@ import brooklyn.event.SensorEventListener; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.management.SubscriptionHandle; import brooklyn.util.logging.LoggingSetup; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/util/internal/FlagUtilsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/util/internal/FlagUtilsTest.java b/core/src/test/java/brooklyn/util/internal/FlagUtilsTest.java index 3dda990..0cf1643 100644 --- a/core/src/test/java/brooklyn/util/internal/FlagUtilsTest.java +++ b/core/src/test/java/brooklyn/util/internal/FlagUtilsTest.java @@ -28,6 +28,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; @@ -37,7 +38,6 @@ import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.trait.Configurable; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.management.Task; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.flags.FlagUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/util/ssh/BashCommandsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/util/ssh/BashCommandsIntegrationTest.java b/core/src/test/java/brooklyn/util/ssh/BashCommandsIntegrationTest.java index 966856c..d8ee99f 100644 --- a/core/src/test/java/brooklyn/util/ssh/BashCommandsIntegrationTest.java +++ b/core/src/test/java/brooklyn/util/ssh/BashCommandsIntegrationTest.java @@ -33,6 +33,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; +import org.apache.brooklyn.management.ManagementContext; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +45,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/util/task/BasicTaskExecutionPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/util/task/BasicTaskExecutionPerformanceTest.java b/core/src/test/java/brooklyn/util/task/BasicTaskExecutionPerformanceTest.java index 7fd51dd..673e233 100644 --- a/core/src/test/java/brooklyn/util/task/BasicTaskExecutionPerformanceTest.java +++ b/core/src/test/java/brooklyn/util/task/BasicTaskExecutionPerformanceTest.java @@ -27,13 +27,13 @@ import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.management.Task; import brooklyn.util.collections.MutableMap; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/util/task/BasicTaskExecutionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/util/task/BasicTaskExecutionTest.java b/core/src/test/java/brooklyn/util/task/BasicTaskExecutionTest.java index 2471f87..e5342fb 100644 --- a/core/src/test/java/brooklyn/util/task/BasicTaskExecutionTest.java +++ b/core/src/test/java/brooklyn/util/task/BasicTaskExecutionTest.java @@ -34,13 +34,13 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.management.Task; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/util/task/BasicTasksFutureTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/util/task/BasicTasksFutureTest.java b/core/src/test/java/brooklyn/util/task/BasicTasksFutureTest.java index 08c7f7a..95f2e04 100644 --- a/core/src/test/java/brooklyn/util/task/BasicTasksFutureTest.java +++ b/core/src/test/java/brooklyn/util/task/BasicTasksFutureTest.java @@ -28,6 +28,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -35,7 +36,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.management.Task; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/util/task/CompoundTaskExecutionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/util/task/CompoundTaskExecutionTest.java b/core/src/test/java/brooklyn/util/task/CompoundTaskExecutionTest.java index a793825..c791995 100644 --- a/core/src/test/java/brooklyn/util/task/CompoundTaskExecutionTest.java +++ b/core/src/test/java/brooklyn/util/task/CompoundTaskExecutionTest.java @@ -29,6 +29,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Semaphore; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterClass; @@ -36,7 +37,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.testng.collections.Lists; -import brooklyn.management.Task; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/util/task/DynamicSequentialTaskTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/util/task/DynamicSequentialTaskTest.java b/core/src/test/java/brooklyn/util/task/DynamicSequentialTaskTest.java index a2f5f2b..f52f8f9 100644 --- a/core/src/test/java/brooklyn/util/task/DynamicSequentialTaskTest.java +++ b/core/src/test/java/brooklyn/util/task/DynamicSequentialTaskTest.java @@ -28,6 +28,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.management.HasTaskChildren; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -35,8 +37,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.management.HasTaskChildren; -import brooklyn.management.Task; 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/f7f03580/core/src/test/java/brooklyn/util/task/NonBasicTaskExecutionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/util/task/NonBasicTaskExecutionTest.java b/core/src/test/java/brooklyn/util/task/NonBasicTaskExecutionTest.java index 543c2ff..01f875f 100644 --- a/core/src/test/java/brooklyn/util/task/NonBasicTaskExecutionTest.java +++ b/core/src/test/java/brooklyn/util/task/NonBasicTaskExecutionTest.java @@ -30,13 +30,13 @@ import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.management.Task; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/util/task/ScheduledExecutionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/util/task/ScheduledExecutionTest.java b/core/src/test/java/brooklyn/util/task/ScheduledExecutionTest.java index 4f1a0b8..c21efa6 100644 --- a/core/src/test/java/brooklyn/util/task/ScheduledExecutionTest.java +++ b/core/src/test/java/brooklyn/util/task/ScheduledExecutionTest.java @@ -29,12 +29,12 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.management.Task; 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/f7f03580/core/src/test/java/brooklyn/util/task/TaskFinalizationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/util/task/TaskFinalizationTest.java b/core/src/test/java/brooklyn/util/task/TaskFinalizationTest.java index b906fec..0d3908a 100644 --- a/core/src/test/java/brooklyn/util/task/TaskFinalizationTest.java +++ b/core/src/test/java/brooklyn/util/task/TaskFinalizationTest.java @@ -21,12 +21,12 @@ package brooklyn.util.task; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.management.Task; import brooklyn.util.time.Time; import com.google.common.base.Stopwatch; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/util/task/TasksTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/util/task/TasksTest.java b/core/src/test/java/brooklyn/util/task/TasksTest.java index c74278a..a1439fb 100644 --- a/core/src/test/java/brooklyn/util/task/TasksTest.java +++ b/core/src/test/java/brooklyn/util/task/TasksTest.java @@ -26,14 +26,14 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.Callable; +import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.management.Task; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.EntityFunctions; -import brooklyn.management.ExecutionContext; -import brooklyn.management.Task; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; import brooklyn.util.guava.Functionals; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/core/src/test/java/brooklyn/util/task/ValueResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/util/task/ValueResolverTest.java b/core/src/test/java/brooklyn/util/task/ValueResolverTest.java index 324c9f1..f29b3dc 100644 --- a/core/src/test/java/brooklyn/util/task/ValueResolverTest.java +++ b/core/src/test/java/brooklyn/util/task/ValueResolverTest.java @@ -20,13 +20,13 @@ package brooklyn.util.task; import java.util.concurrent.Callable; +import org.apache.brooklyn.management.ExecutionContext; +import org.apache.brooklyn.management.Task; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.management.ExecutionContext; -import brooklyn.management.Task; import brooklyn.util.guava.Maybe; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 44b442a..01f8939 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.management.ManagementContext; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +35,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.management.ManagementContext; 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/f7f03580/core/src/test/java/brooklyn/util/task/system/SystemTasksTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/util/task/system/SystemTasksTest.java b/core/src/test/java/brooklyn/util/task/system/SystemTasksTest.java index 8a0e2bd..2270d8d 100644 --- a/core/src/test/java/brooklyn/util/task/system/SystemTasksTest.java +++ b/core/src/test/java/brooklyn/util/task/system/SystemTasksTest.java @@ -20,13 +20,13 @@ package brooklyn.util.task.system; import java.io.File; +import org.apache.brooklyn.management.ManagementContext; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.os.Os; import brooklyn.util.task.ssh.SshTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/locations/jclouds/src/main/java/brooklyn/entity/rebind/persister/jclouds/JcloudsBlobStoreBasedObjectStore.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/brooklyn/entity/rebind/persister/jclouds/JcloudsBlobStoreBasedObjectStore.java b/locations/jclouds/src/main/java/brooklyn/entity/rebind/persister/jclouds/JcloudsBlobStoreBasedObjectStore.java index 60d7f1b..5f59f06 100644 --- a/locations/jclouds/src/main/java/brooklyn/entity/rebind/persister/jclouds/JcloudsBlobStoreBasedObjectStore.java +++ b/locations/jclouds/src/main/java/brooklyn/entity/rebind/persister/jclouds/JcloudsBlobStoreBasedObjectStore.java @@ -24,6 +24,8 @@ import java.util.List; import javax.annotation.Nullable; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.options.ListContainerOptions; @@ -37,8 +39,6 @@ import brooklyn.location.basic.LocationConfigKeys; import brooklyn.location.cloud.CloudLocationConfig; import brooklyn.location.jclouds.JcloudsLocation; import brooklyn.location.jclouds.JcloudsUtil; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.util.exceptions.FatalConfigurationRuntimeException; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/locations/jclouds/src/main/java/brooklyn/location/jclouds/BrooklynMachinePool.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/BrooklynMachinePool.java b/locations/jclouds/src/main/java/brooklyn/location/jclouds/BrooklynMachinePool.java index 889012e..be294db 100644 --- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/BrooklynMachinePool.java +++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/BrooklynMachinePool.java @@ -25,6 +25,7 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.management.Task; import org.jclouds.compute.domain.NodeMetadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +38,6 @@ import brooklyn.location.basic.WinRmMachineLocation; import brooklyn.location.jclouds.pool.MachinePool; import brooklyn.location.jclouds.pool.MachineSet; import brooklyn.location.jclouds.pool.ReusableMachineTemplate; -import brooklyn.management.Task; import brooklyn.util.collections.MutableMap; import brooklyn.util.task.BasicExecutionContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsByonLocationResolver.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsByonLocationResolver.java b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsByonLocationResolver.java index b60ddc9..709a098 100644 --- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsByonLocationResolver.java +++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsByonLocationResolver.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.brooklyn.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +39,6 @@ import brooklyn.location.basic.LocationConfigKeys; import brooklyn.location.basic.LocationConfigUtils; import brooklyn.location.basic.LocationInternal; import brooklyn.location.basic.LocationPropertiesFromBrooklynProperties; -import brooklyn.management.ManagementContext; 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/f7f03580/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java index 0f4035b..d1ebcfb 100644 --- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java +++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java @@ -50,6 +50,7 @@ import java.util.regex.Pattern; import javax.annotation.Nullable; +import org.apache.brooklyn.management.AccessController; import org.jclouds.aws.ec2.compute.AWSEC2TemplateOptions; import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions; import org.jclouds.compute.ComputeService; @@ -145,7 +146,6 @@ import brooklyn.location.jclouds.JcloudsPredicates.NodeInLocation; import brooklyn.location.jclouds.networking.JcloudsPortForwarderExtension; import brooklyn.location.jclouds.templates.PortableTemplateBuilder; import brooklyn.location.jclouds.zone.AwsAvailabilityZoneExtension; -import brooklyn.management.AccessController; 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/f7f03580/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationResolver.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationResolver.java b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationResolver.java index 3a90653..b8f9882 100644 --- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationResolver.java +++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationResolver.java @@ -25,6 +25,7 @@ import java.util.Collection; import java.util.Map; import java.util.NoSuchElementException; +import org.apache.brooklyn.management.ManagementContext; import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.Apis; import org.jclouds.providers.ProviderMetadata; @@ -39,7 +40,6 @@ import brooklyn.location.basic.BasicLocationRegistry; import brooklyn.location.basic.LocationConfigKeys; import brooklyn.location.basic.LocationConfigUtils; import brooklyn.location.basic.LocationInternal; -import brooklyn.management.ManagementContext; import brooklyn.util.text.Strings; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/locations/jclouds/src/main/java/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtension.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtension.java b/locations/jclouds/src/main/java/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtension.java index f0b07ce..250d900 100644 --- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtension.java +++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtension.java @@ -24,6 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; import java.util.Set; +import org.apache.brooklyn.management.ManagementContext; import org.jclouds.aws.ec2.AWSEC2Api; import org.jclouds.ec2.domain.AvailabilityZoneInfo; @@ -31,7 +32,6 @@ import brooklyn.location.Location; import brooklyn.location.cloud.AbstractAvailabilityZoneExtension; import brooklyn.location.cloud.AvailabilityZoneExtension; import brooklyn.location.jclouds.JcloudsLocation; -import brooklyn.management.ManagementContext; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java index e753a18..1daf882 100644 --- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java +++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java @@ -27,6 +27,7 @@ import java.net.URL; import java.util.List; import java.util.Map.Entry; +import org.apache.brooklyn.management.ManagementContext; import org.apache.http.client.HttpClient; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.domain.PageSet; @@ -46,7 +47,6 @@ import brooklyn.location.basic.LocationConfigKeys; import brooklyn.location.cloud.CloudLocationConfig; import brooklyn.location.jclouds.JcloudsLocation; import brooklyn.location.jclouds.JcloudsUtil; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.collections.MutableMap; import brooklyn.util.http.HttpTool; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStorePersistencePerformanceTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStorePersistencePerformanceTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStorePersistencePerformanceTest.java index 6ae9190..afb4c7b 100644 --- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStorePersistencePerformanceTest.java +++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStorePersistencePerformanceTest.java @@ -21,13 +21,13 @@ package brooklyn.entity.rebind.persister.jclouds; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.PersistenceObjectStore.StoreObjectAccessor; -import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.qa.performance.AbstractPerformanceTest; import brooklyn.util.text.Identifiers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java index c01fa35..9055c22 100644 --- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java +++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java @@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.io.IOException; +import org.apache.brooklyn.management.ManagementContext; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.PageSet; @@ -38,7 +39,6 @@ import brooklyn.location.basic.LocationConfigKeys; import brooklyn.location.cloud.CloudLocationConfig; import brooklyn.location.jclouds.JcloudsLocation; import brooklyn.location.jclouds.JcloudsUtil; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.stream.Streams; import brooklyn.util.text.Identifiers;
