http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 37679e2..9a21a45 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/ListeningObjectStore.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/ListeningObjectStore.java @@ -24,8 +24,8 @@ 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.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 81ccbdc..3efd123 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java @@ -32,7 +32,6 @@ 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; @@ -50,6 +49,7 @@ 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.entity.rebind.BrooklynObjectType; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.catalog.internal.CatalogItemBuilder; import brooklyn.catalog.internal.CatalogItemDtoAbstract; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 d560267..29ad739 100644 --- a/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java @@ -30,8 +30,8 @@ import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.api.entity.rebind.RebindManager.RebindFailureMode; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.mementos.BrooklynMementoRawData; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 c5b48f2..ab80fd3 100644 --- a/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java +++ b/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java @@ -20,7 +20,7 @@ package brooklyn.entity.trait; import java.util.Collection; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.test.entity.TestEntityImpl; import org.testng.Assert; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 5a9fc21..640cc2f 100644 --- a/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java +++ b/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 9227260..5d8f029 100644 --- a/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java +++ b/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java @@ -25,7 +25,7 @@ import java.io.File; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; -import org.apache.brooklyn.management.ha.MementoCopyMode; +import org.apache.brooklyn.api.management.ha.MementoCopyMode; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 e2f7b58..30991ef 100644 --- a/core/src/test/java/brooklyn/location/basic/AbstractLocationTest.java +++ b/core/src/test/java/brooklyn/location/basic/AbstractLocationTest.java @@ -26,7 +26,7 @@ import static org.testng.Assert.assertTrue; import java.util.Collections; import java.util.Map; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; 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/2e2de8e4/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 5ef883c..3dcbe1e 100644 --- a/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java +++ b/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java @@ -25,7 +25,7 @@ import java.util.Set; import javax.annotation.Nullable; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; 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/2e2de8e4/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 e50269d..0df4677 100644 --- a/core/src/test/java/brooklyn/location/basic/LocationConfigTest.java +++ b/core/src/test/java/brooklyn/location/basic/LocationConfigTest.java @@ -20,7 +20,7 @@ package brooklyn.location.basic; import static org.testng.Assert.assertEquals; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; 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/2e2de8e4/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 04e3b40..44e659f 100644 --- a/core/src/test/java/brooklyn/location/basic/LocationExtensionsTest.java +++ b/core/src/test/java/brooklyn/location/basic/LocationExtensionsTest.java @@ -26,7 +26,7 @@ import brooklyn.entity.basic.Entities; import brooklyn.location.Location; import brooklyn.location.LocationSpec; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; 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/2e2de8e4/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 dbf24e1..2a1faa5 100644 --- a/core/src/test/java/brooklyn/location/basic/LocationManagementTest.java +++ b/core/src/test/java/brooklyn/location/basic/LocationManagementTest.java @@ -24,7 +24,7 @@ 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.apache.brooklyn.api.management.LocationManager; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 8833b1f..4041d1e 100644 --- a/core/src/test/java/brooklyn/location/basic/MachineDetailsTest.java +++ b/core/src/test/java/brooklyn/location/basic/MachineDetailsTest.java @@ -23,8 +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.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.Task; 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/2e2de8e4/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 4ae80cb..440405c 100644 --- a/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java +++ b/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java @@ -22,7 +22,7 @@ import java.io.File; import java.util.List; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; 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/2e2de8e4/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 3c65eed..9b62e41 100644 --- a/core/src/test/java/brooklyn/location/basic/SshMachineLocationIntegrationTest.java +++ b/core/src/test/java/brooklyn/location/basic/SshMachineLocationIntegrationTest.java @@ -28,7 +28,7 @@ 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.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 dce9b75..03df8fc 100644 --- a/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java +++ b/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java @@ -37,7 +37,7 @@ 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.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; 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/2e2de8e4/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 ef39d71..9674d93 100644 --- a/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManager.java +++ b/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManager.java @@ -18,9 +18,9 @@ */ 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; +import org.apache.brooklyn.api.management.entitlement.EntitlementClass; +import org.apache.brooklyn.api.management.entitlement.EntitlementContext; +import org.apache.brooklyn.api.management.entitlement.EntitlementManager; public class AcmeEntitlementManager extends PerUserEntitlementManager { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 f1716b2..361c636 100644 --- a/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java +++ b/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java @@ -23,7 +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.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; 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/2e2de8e4/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 783adc7..901c5ae 100644 --- a/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java +++ b/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java @@ -23,8 +23,8 @@ import static org.testng.Assert.assertTrue; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.ManagementContext; -import org.apache.brooklyn.management.entitlement.EntitlementManager; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.entitlement.EntitlementManager; 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/2e2de8e4/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 b89c349..6aa9167 100644 --- a/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java +++ b/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java @@ -20,7 +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.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; 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/2e2de8e4/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 b24b84f..b4d4def 100644 --- a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerInMemoryTest.java +++ b/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerInMemoryTest.java @@ -23,7 +23,7 @@ import java.util.List; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 e48a01b..d085acf 100644 --- a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerSplitBrainTest.java +++ b/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerSplitBrainTest.java @@ -28,11 +28,11 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicLong; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -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.apache.brooklyn.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 7f35f16..57a5d2e 100644 --- a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerTestFixture.java +++ b/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerTestFixture.java @@ -27,11 +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.apache.brooklyn.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister; 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/2e2de8e4/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 177c3fc..192a649 100644 --- a/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java +++ b/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java @@ -33,9 +33,9 @@ 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.management.ha.HighAvailabilityMode; -import org.apache.brooklyn.management.ha.ManagementNodeState; -import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecordPersister; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 bafc19a..10c47f9 100644 --- a/core/src/test/java/brooklyn/management/ha/ImmutableManagementPlaneSyncRecord.java +++ b/core/src/test/java/brooklyn/management/ha/ImmutableManagementPlaneSyncRecord.java @@ -20,8 +20,8 @@ package brooklyn.management.ha; import java.util.Map; -import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; -import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.api.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/2e2de8e4/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 2e0eeb0..bc8b418 100644 --- a/core/src/test/java/brooklyn/management/ha/ManagementPlaneSyncRecordPersisterInMemory.java +++ b/core/src/test/java/brooklyn/management/ha/ManagementPlaneSyncRecordPersisterInMemory.java @@ -23,9 +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.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 fedc040..14804b1 100644 --- a/core/src/test/java/brooklyn/management/ha/MasterChooserTest.java +++ b/core/src/test/java/brooklyn/management/ha/MasterChooserTest.java @@ -23,8 +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.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 a0a1496..a68cac3 100644 --- a/core/src/test/java/brooklyn/management/ha/MutableManagementPlaneSyncRecord.java +++ b/core/src/test/java/brooklyn/management/ha/MutableManagementPlaneSyncRecord.java @@ -20,8 +20,8 @@ package brooklyn.management.ha; import java.util.Map; -import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; -import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 428047d..e4ab1ca 100644 --- a/core/src/test/java/brooklyn/management/ha/WarmStandbyTest.java +++ b/core/src/test/java/brooklyn/management/ha/WarmStandbyTest.java @@ -24,9 +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.apache.brooklyn.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 d12ed54..d8cb07a 100644 --- a/core/src/test/java/brooklyn/management/internal/EntityExecutionManagerTest.java +++ b/core/src/test/java/brooklyn/management/internal/EntityExecutionManagerTest.java @@ -32,8 +32,8 @@ import java.util.concurrent.Semaphore; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.ExecutionManager; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.ExecutionManager; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 c19355a..2d1f296 100644 --- a/core/src/test/java/brooklyn/management/internal/LocalManagementContextTest.java +++ b/core/src/test/java/brooklyn/management/internal/LocalManagementContextTest.java @@ -25,7 +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.apache.brooklyn.api.management.ManagementContext.PropertiesReloadListener; 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/2e2de8e4/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 051874e..7907d30 100644 --- a/core/src/test/java/brooklyn/management/internal/LocalSubscriptionManagerTest.java +++ b/core/src/test/java/brooklyn/management/internal/LocalSubscriptionManagerTest.java @@ -31,8 +31,8 @@ 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.management.SubscriptionHandle; -import org.apache.brooklyn.management.SubscriptionManager; +import org.apache.brooklyn.api.management.SubscriptionHandle; +import org.apache.brooklyn.api.management.SubscriptionManager; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 0af0ae5..9f50987 100644 --- a/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java +++ b/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java @@ -35,6 +35,8 @@ import org.apache.brooklyn.api.basic.BrooklynObject; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; import brooklyn.catalog.internal.CatalogEntityItemDto; import brooklyn.catalog.internal.CatalogItemBuilder; @@ -48,8 +50,6 @@ import brooklyn.entity.proxying.InternalPolicyFactory; 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; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 e0b702c..3981af7 100644 --- a/core/src/test/java/brooklyn/policy/basic/PolicySubscriptionTest.java +++ b/core/src/test/java/brooklyn/policy/basic/PolicySubscriptionTest.java @@ -26,8 +26,8 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.management.SubscriptionHandle; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; -import org.apache.brooklyn.management.SubscriptionHandle; import org.apache.brooklyn.test.entity.TestEntity; import brooklyn.event.basic.BasicSensorEvent; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 bd4ceee..87784f0 100644 --- a/core/src/test/java/brooklyn/qa/performance/AbstractPerformanceTest.java +++ b/core/src/test/java/brooklyn/qa/performance/AbstractPerformanceTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.TimeUnit; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; 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/2e2de8e4/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 d7daf51..8f0b87b 100644 --- a/core/src/test/java/brooklyn/qa/performance/EntityPerformanceTest.java +++ b/core/src/test/java/brooklyn/qa/performance/EntityPerformanceTest.java @@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger; 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.management.Task; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 36e43ad..d445114 100644 --- a/core/src/test/java/brooklyn/qa/performance/SubscriptionPerformanceTest.java +++ b/core/src/test/java/brooklyn/qa/performance/SubscriptionPerformanceTest.java @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicReference; 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.management.SubscriptionManager; +import org.apache.brooklyn.api.management.SubscriptionManager; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 be1f582..ed98dba 100644 --- a/core/src/test/java/brooklyn/util/internal/FlagUtilsTest.java +++ b/core/src/test/java/brooklyn/util/internal/FlagUtilsTest.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.entity.trait.Configurable; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 593de3d..1f8ba28 100644 --- a/core/src/test/java/brooklyn/util/ssh/BashCommandsIntegrationTest.java +++ b/core/src/test/java/brooklyn/util/ssh/BashCommandsIntegrationTest.java @@ -33,7 +33,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 673e233..574c8c7 100644 --- a/core/src/test/java/brooklyn/util/task/BasicTaskExecutionPerformanceTest.java +++ b/core/src/test/java/brooklyn/util/task/BasicTaskExecutionPerformanceTest.java @@ -27,7 +27,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 e5342fb..40660d4 100644 --- a/core/src/test/java/brooklyn/util/task/BasicTaskExecutionTest.java +++ b/core/src/test/java/brooklyn/util/task/BasicTaskExecutionTest.java @@ -34,7 +34,7 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 95f2e04..f1c1332 100644 --- a/core/src/test/java/brooklyn/util/task/BasicTasksFutureTest.java +++ b/core/src/test/java/brooklyn/util/task/BasicTasksFutureTest.java @@ -28,7 +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.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 c791995..9fe4ba0 100644 --- a/core/src/test/java/brooklyn/util/task/CompoundTaskExecutionTest.java +++ b/core/src/test/java/brooklyn/util/task/CompoundTaskExecutionTest.java @@ -29,7 +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.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterClass; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 f52f8f9..a5985fe 100644 --- a/core/src/test/java/brooklyn/util/task/DynamicSequentialTaskTest.java +++ b/core/src/test/java/brooklyn/util/task/DynamicSequentialTaskTest.java @@ -28,8 +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.apache.brooklyn.api.management.HasTaskChildren; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 01f875f..82e3919 100644 --- a/core/src/test/java/brooklyn/util/task/NonBasicTaskExecutionTest.java +++ b/core/src/test/java/brooklyn/util/task/NonBasicTaskExecutionTest.java @@ -30,7 +30,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 c21efa6..1ae65f2 100644 --- a/core/src/test/java/brooklyn/util/task/ScheduledExecutionTest.java +++ b/core/src/test/java/brooklyn/util/task/ScheduledExecutionTest.java @@ -29,7 +29,7 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 0d3908a..51750ca 100644 --- a/core/src/test/java/brooklyn/util/task/TaskFinalizationTest.java +++ b/core/src/test/java/brooklyn/util/task/TaskFinalizationTest.java @@ -21,7 +21,7 @@ package brooklyn.util.task; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 18a4392..58ce24f 100644 --- a/core/src/test/java/brooklyn/util/task/TasksTest.java +++ b/core/src/test/java/brooklyn/util/task/TasksTest.java @@ -26,8 +26,8 @@ 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.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.Assert; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 f29b3dc..d50ff54 100644 --- a/core/src/test/java/brooklyn/util/task/ValueResolverTest.java +++ b/core/src/test/java/brooklyn/util/task/ValueResolverTest.java @@ -20,8 +20,8 @@ package brooklyn.util.task; import java.util.concurrent.Callable; -import org.apache.brooklyn.management.ExecutionContext; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.api.management.Task; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 01f8939..1f31447 100644 --- a/core/src/test/java/brooklyn/util/task/ssh/SshTasksTest.java +++ b/core/src/test/java/brooklyn/util/task/ssh/SshTasksTest.java @@ -21,7 +21,7 @@ package brooklyn.util.task.ssh; import java.io.File; import java.io.IOException; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 2270d8d..b19c389 100644 --- a/core/src/test/java/brooklyn/util/task/system/SystemTasksTest.java +++ b/core/src/test/java/brooklyn/util/task/system/SystemTasksTest.java @@ -20,7 +20,7 @@ package brooklyn.util.task.system; import java.io.File; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/core/src/test/java/org/apache/brooklyn/test/entity/TestApplication.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/test/entity/TestApplication.java b/core/src/test/java/org/apache/brooklyn/test/entity/TestApplication.java index 281c420..545094c 100644 --- a/core/src/test/java/org/apache/brooklyn/test/entity/TestApplication.java +++ b/core/src/test/java/org/apache/brooklyn/test/entity/TestApplication.java @@ -24,7 +24,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.EntityInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 cfd6e90..70904e6 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,7 +25,7 @@ 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.management.SubscriptionHandle; +import org.apache.brooklyn.api.management.SubscriptionHandle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 5f59f06..b72dca2 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,8 +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.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.options.ListContainerOptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 01429a9..6fc2076 100644 --- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/BrooklynMachinePool.java +++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/BrooklynMachinePool.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.jclouds.compute.domain.NodeMetadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 709a098..a027907 100644 --- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsByonLocationResolver.java +++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsByonLocationResolver.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 9cd2f3d..ed3ed2a 100644 --- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java +++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java @@ -51,7 +51,7 @@ import java.util.regex.Pattern; import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.AccessController; +import org.apache.brooklyn.api.management.AccessController; import org.jclouds.aws.ec2.compute.AWSEC2TemplateOptions; import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions; import org.jclouds.compute.ComputeService; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 b8f9882..0a07898 100644 --- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationResolver.java +++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationResolver.java @@ -25,7 +25,7 @@ import java.util.Collection; import java.util.Map; import java.util.NoSuchElementException; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.Apis; import org.jclouds.providers.ProviderMetadata; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 250d900..20bfb4c 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,7 +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.apache.brooklyn.api.management.ManagementContext; import org.jclouds.aws.ec2.AWSEC2Api; import org.jclouds.ec2.domain.AvailabilityZoneInfo; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 f1622b3..c29bf79 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,7 +27,7 @@ import java.net.URL; import java.util.List; import java.util.Map.Entry; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.http.client.HttpClient; import org.jclouds.blobstore.BlobStoreContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/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 afb4c7b..119aa1e 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,7 +21,7 @@ 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.apache.brooklyn.api.management.ha.HighAvailabilityMode; 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/2e2de8e4/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 ba75e8d..f9ba3a9 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,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.io.IOException; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.domain.Blob; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsExpect100ContinueTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsExpect100ContinueTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsExpect100ContinueTest.java index 33ff2fa..eaaf0f8 100644 --- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsExpect100ContinueTest.java +++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsExpect100ContinueTest.java @@ -18,7 +18,7 @@ */ package brooklyn.entity.rebind.persister.jclouds; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.BlobStoreContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java index 6669f8b..b4ec143 100644 --- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java +++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/JcloudsObjectStoreAccessorWriterTest.java @@ -20,7 +20,7 @@ package brooklyn.entity.rebind.persister.jclouds; import java.io.IOException; -import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; 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/2e2de8e4/locations/jclouds/src/test/java/brooklyn/location/jclouds/BailOutJcloudsLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/BailOutJcloudsLocation.java b/locations/jclouds/src/test/java/brooklyn/location/jclouds/BailOutJcloudsLocation.java index 2567c79..d952c5b 100644 --- a/locations/jclouds/src/test/java/brooklyn/location/jclouds/BailOutJcloudsLocation.java +++ b/locations/jclouds/src/test/java/brooklyn/location/jclouds/BailOutJcloudsLocation.java @@ -24,7 +24,7 @@ import java.util.Map; import javax.annotation.Nullable; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; 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/2e2de8e4/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java b/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java index c83663e..703b2f9 100644 --- a/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java +++ b/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java @@ -23,7 +23,7 @@ import static org.testng.Assert.assertTrue; import java.util.List; import java.util.Map; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AwsEc2LocationWindowsLiveTest.groovy ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AwsEc2LocationWindowsLiveTest.groovy b/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AwsEc2LocationWindowsLiveTest.groovy index acbb32f..f19b61b 100644 --- a/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AwsEc2LocationWindowsLiveTest.groovy +++ b/locations/jclouds/src/test/java/brooklyn/location/jclouds/provider/AwsEc2LocationWindowsLiveTest.groovy @@ -30,7 +30,7 @@ import brooklyn.entity.basic.Entities import brooklyn.location.basic.SshMachineLocation import brooklyn.location.jclouds.JcloudsLocation import brooklyn.location.jclouds.JcloudsSshMachineLocation -import org.apache.brooklyn.management.ManagementContext +import org.apache.brooklyn.api.management.ManagementContext import com.google.common.collect.ImmutableMap http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java b/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java index 53745bb..f3de4dd 100644 --- a/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java +++ b/policy/src/main/java/brooklyn/entity/brooklyn/BrooklynMetricsImpl.java @@ -23,7 +23,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import brooklyn.entity.basic.AbstractEntity; import brooklyn.management.internal.LocalSubscriptionManager; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java b/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java index 3d075fc..f88dc60 100644 --- a/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java +++ b/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.Sensor; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy b/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy index 70f0a8a..406fc27 100644 --- a/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy +++ b/policy/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy @@ -30,7 +30,7 @@ import brooklyn.entity.basic.Entities import org.apache.brooklyn.api.entity.basic.EntityLocal import org.apache.brooklyn.api.event.Sensor import brooklyn.event.basic.BasicAttributeSensor -import org.apache.brooklyn.management.SubscriptionContext +import org.apache.brooklyn.api.management.SubscriptionContext import brooklyn.management.internal.LocalManagementContext class DeltaEnrichersTests { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/policy/src/test/java/brooklyn/enricher/RollingMeanEnricherTest.groovy ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/enricher/RollingMeanEnricherTest.groovy b/policy/src/test/java/brooklyn/enricher/RollingMeanEnricherTest.groovy index 6fcdeb1..f40dfdb 100644 --- a/policy/src/test/java/brooklyn/enricher/RollingMeanEnricherTest.groovy +++ b/policy/src/test/java/brooklyn/enricher/RollingMeanEnricherTest.groovy @@ -30,7 +30,7 @@ import brooklyn.entity.basic.Entities import org.apache.brooklyn.api.entity.basic.EntityLocal import org.apache.brooklyn.api.event.Sensor import brooklyn.event.basic.BasicAttributeSensor -import org.apache.brooklyn.management.SubscriptionContext +import org.apache.brooklyn.api.management.SubscriptionContext class RollingMeanEnricherTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/policy/src/test/java/brooklyn/enricher/RollingTimeWindowMeanEnricherTest.groovy ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/enricher/RollingTimeWindowMeanEnricherTest.groovy b/policy/src/test/java/brooklyn/enricher/RollingTimeWindowMeanEnricherTest.groovy index e030866..1bee0e4 100644 --- a/policy/src/test/java/brooklyn/enricher/RollingTimeWindowMeanEnricherTest.groovy +++ b/policy/src/test/java/brooklyn/enricher/RollingTimeWindowMeanEnricherTest.groovy @@ -31,7 +31,7 @@ import brooklyn.entity.basic.Entities import org.apache.brooklyn.api.entity.basic.EntityLocal import org.apache.brooklyn.api.event.Sensor import brooklyn.event.basic.BasicAttributeSensor -import org.apache.brooklyn.management.SubscriptionContext +import org.apache.brooklyn.api.management.SubscriptionContext class RollingTimeWindowMeanEnricherTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java b/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java index 43f1fa3..508a587 100644 --- a/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java +++ b/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java @@ -26,7 +26,7 @@ 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.event.Sensor; -import org.apache.brooklyn.management.SubscriptionContext; +import org.apache.brooklyn.api.management.SubscriptionContext; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java b/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java index a4301ac..ae14af0 100644 --- a/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java +++ b/policy/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java @@ -29,7 +29,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/policy/src/test/java/brooklyn/policy/ha/ConnectionFailureDetectorTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ConnectionFailureDetectorTest.java b/policy/src/test/java/brooklyn/policy/ha/ConnectionFailureDetectorTest.java index ece96a2..fdc5680 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ConnectionFailureDetectorTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ConnectionFailureDetectorTest.java @@ -31,7 +31,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java b/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java index 2c3ef54..d3708cc 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java @@ -28,7 +28,7 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java b/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java index d51f259..5116461 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java @@ -30,7 +30,7 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; -import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java b/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java index ed2e646..e686466 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java @@ -31,7 +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.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java b/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java index 2a463ca..665e3ec 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java @@ -29,7 +29,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.management.ManagementContext; +import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java index fc9a136..247ba98 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SameServerDriverLifecycleEffectorTasks.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.api.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java b/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java index aabbf53..912a2f7 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collection; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers; import brooklyn.entity.software.MachineLifecycleEffectorTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java index 4be5e0b..f2427f3 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessDriverLifecycleEffectorTasks.java @@ -20,7 +20,7 @@ package brooklyn.entity.basic; import java.util.Map; -import org.apache.brooklyn.management.TaskAdaptable; +import org.apache.brooklyn.api.management.TaskAdaptable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java index 8e78313..fedaf11 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java @@ -36,7 +36,7 @@ import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity; import org.apache.brooklyn.api.entity.drivers.EntityDriverManager; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; -import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.policy.EnricherSpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/basic/lifecycle/ScriptHelper.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/lifecycle/ScriptHelper.java b/software/base/src/main/java/brooklyn/entity/basic/lifecycle/ScriptHelper.java index 172bc6f..c8844d5 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/lifecycle/ScriptHelper.java +++ b/software/base/src/main/java/brooklyn/entity/basic/lifecycle/ScriptHelper.java @@ -32,9 +32,9 @@ import java.util.concurrent.Callable; import javax.annotation.Nullable; -import org.apache.brooklyn.management.ExecutionContext; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskQueueingContext; +import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.TaskQueueingContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynClusterImpl.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynClusterImpl.java index cf69bb2..ca170d5 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynClusterImpl.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynClusterImpl.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java index e6ee46e..da6016b 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java @@ -29,8 +29,8 @@ import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; -import org.apache.brooklyn.management.ha.HighAvailabilityMode; -import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynConfigKeys; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e2de8e4/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java index e052439..0861c34 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java @@ -28,9 +28,9 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.management.Task; -import org.apache.brooklyn.management.TaskAdaptable; -import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.management.TaskAdaptable; +import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.http.HttpStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
