Repository: incubator-brooklyn Updated Branches: refs/heads/master 083953f1c -> 6caee5899
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java index a14bc22..bfe82ba 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java @@ -50,6 +50,8 @@ import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.core.management.entitlement.Entitlements; +import org.apache.brooklyn.core.management.entitlement.Entitlements.StringAndArgument; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.config.ConfigKey; @@ -61,8 +63,6 @@ import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.trait.Startable; -import brooklyn.management.entitlement.Entitlements; -import brooklyn.management.entitlement.Entitlements.StringAndArgument; import brooklyn.policy.basic.AbstractPolicy; import org.apache.brooklyn.rest.domain.ApplicationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/DefaultExceptionMapper.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/DefaultExceptionMapper.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/DefaultExceptionMapper.java index f8b2402..491c1a7 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/DefaultExceptionMapper.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/DefaultExceptionMapper.java @@ -30,10 +30,10 @@ import javax.ws.rs.ext.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.error.YAMLException; - -import brooklyn.management.entitlement.Entitlements; +import org.apache.brooklyn.core.management.entitlement.Entitlements; import org.apache.brooklyn.rest.domain.ApiError; import org.apache.brooklyn.rest.domain.ApiError.Builder; + import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.exceptions.UserFacingException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java index 70b72f8..4c3ad5e 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java @@ -23,6 +23,7 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.management.ManagementContextInjectable; import org.codehaus.jackson.Version; import org.codehaus.jackson.jaxrs.JacksonJsonProvider; import org.codehaus.jackson.map.ObjectMapper; @@ -36,7 +37,6 @@ import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServiceAttributes; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.management.ManagementContextInjectable; public class BrooklynJacksonJsonProvider extends JacksonJsonProvider implements ManagementContextInjectable { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java index e4fc53a..5bf673d 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java @@ -33,6 +33,8 @@ import javax.servlet.Filter; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherAbstract; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.servlet.FilterHolder; @@ -46,8 +48,6 @@ import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.BrooklynServiceAttributes; -import brooklyn.management.internal.LocalManagementContext; -import brooklyn.management.internal.ManagementContextInternal; import org.apache.brooklyn.rest.filter.BrooklynPropertiesSecurityFilter; import org.apache.brooklyn.rest.filter.HaMasterCheckFilter; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java index 6d6996c..2a2a569 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java @@ -28,9 +28,9 @@ import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.BrooklynServiceAttributes; import brooklyn.entity.basic.Entities; -import brooklyn.management.internal.LocalManagementContext; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaHotCheckTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaHotCheckTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaHotCheckTest.java index e0ad096..e51fbbe 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaHotCheckTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaHotCheckTest.java @@ -25,13 +25,11 @@ import javax.ws.rs.core.MediaType; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.management.internal.LocalManagementContext; -import brooklyn.management.internal.ManagementContextInternal; - import org.apache.brooklyn.api.management.ha.HighAvailabilityManager; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.rest.filter.HaHotCheckResourceFilter; import org.apache.brooklyn.rest.filter.HaMasterCheckFilter; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java index de4d778..e60e16a 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java @@ -42,9 +42,9 @@ import org.testng.annotations.Test; import org.testng.reporters.Files; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.catalog.CatalogItem.CatalogBundle; +import org.apache.brooklyn.core.management.osgi.OsgiStandaloneTest; import brooklyn.catalog.internal.CatalogUtils; -import brooklyn.management.osgi.OsgiStandaloneTest; import brooklyn.policy.autoscaling.AutoScalerPolicy; import org.apache.brooklyn.rest.domain.CatalogEntitySummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java index 6ab034d..c228b95 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java @@ -33,10 +33,10 @@ import org.eclipse.jetty.server.Server; import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; -import brooklyn.management.internal.LocalManagementContext; -import brooklyn.management.internal.ManagementContextInternal; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.rest.BrooklynRestApiLauncher; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; import org.apache.brooklyn.rest.security.provider.TestSecurityProvider; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java index 8059278..13de9e9 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java @@ -43,10 +43,10 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.EmptySoftwareProcessDriver; import brooklyn.entity.basic.EmptySoftwareProcessImpl; -import brooklyn.management.internal.ManagementContextInternal; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.rest.domain.HighAvailabilitySummary; import org.apache.brooklyn.rest.domain.VersionSummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java index 42d1717..fd3504d 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java @@ -42,12 +42,10 @@ import brooklyn.entity.basic.SoftwareProcessEntityTest; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.NoMachinesAvailableException; +import org.apache.brooklyn.core.management.internal.LocalUsageManager; +import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.management.internal.LocalUsageManager; -import brooklyn.management.internal.ManagementContextInternal; - import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.EntitySpec; import org.apache.brooklyn.rest.domain.Status; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java index 9d1e9bd..d6a8829 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java @@ -21,6 +21,8 @@ package org.apache.brooklyn.rest.testing; import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; +import org.apache.brooklyn.core.management.ManagementContextInjectable; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.codehaus.jackson.map.ObjectMapper; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeMethod; @@ -35,10 +37,6 @@ import com.sun.jersey.test.framework.LowLevelAppDescriptor; import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.BasicLocationRegistry; - -import brooklyn.management.ManagementContextInjectable; -import brooklyn.management.internal.LocalManagementContext; - import org.apache.brooklyn.rest.BrooklynRestApi; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTest; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java index 71e161a..989ea3e 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java @@ -32,6 +32,7 @@ import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.core.management.internal.LocalManagementContext; import brooklyn.catalog.internal.CatalogItemBuilder; import brooklyn.catalog.internal.CatalogTemplateItemDto; @@ -40,7 +41,6 @@ import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.BasicEntity; import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntityProxy; -import brooklyn.management.internal.LocalManagementContext; import brooklyn.policy.basic.AbstractPolicy; import org.apache.brooklyn.rest.domain.ApplicationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6602f694/utils/test-support/src/main/java/org/apache/brooklyn/test/BrooklynLeakListener.java ---------------------------------------------------------------------- diff --git a/utils/test-support/src/main/java/org/apache/brooklyn/test/BrooklynLeakListener.java b/utils/test-support/src/main/java/org/apache/brooklyn/test/BrooklynLeakListener.java index 7064153..4f95feb 100644 --- a/utils/test-support/src/main/java/org/apache/brooklyn/test/BrooklynLeakListener.java +++ b/utils/test-support/src/main/java/org/apache/brooklyn/test/BrooklynLeakListener.java @@ -48,7 +48,7 @@ public class BrooklynLeakListener extends TestListenerAdapter { * depend on brooklyn-core, so LocalManagementContext may not be on the classpath. */ private void tryTerminateAll(String context, ITestContext testContext) { - String clazzName = "brooklyn.management.internal.LocalManagementContext"; + String clazzName = "org.apache.brooklyn.core.management.internal.LocalManagementContext"; String message; int level; try {
