http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java index 368e887..3df9b44 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java @@ -35,10 +35,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynServiceAttributes; -import brooklyn.management.ManagementContext; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.WebEntitlementContext; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.security.provider.DelegatingSecurityProvider; + import brooklyn.util.text.Strings; import com.sun.jersey.core.util.Base64;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java index ab0598e..2ed8349 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java @@ -28,10 +28,10 @@ import javax.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.brooklyn.rest.domain.ApiError; + import brooklyn.util.text.Strings; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java index f5c1b4d..ee211bd 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java @@ -36,10 +36,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynServiceAttributes; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.ManagementNodeState; + +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.brooklyn.rest.domain.ApiError; import org.apache.brooklyn.rest.util.WebResourceUtils; + import brooklyn.util.text.Strings; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java index 37a48e6..837ee63 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java @@ -31,11 +31,13 @@ import brooklyn.config.BrooklynServiceAttributes; import brooklyn.config.render.RendererHints; import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityLocal; -import brooklyn.management.ManagementContext; import brooklyn.management.ManagementContextInjectable; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; import org.apache.brooklyn.rest.util.WebResourceUtils; import org.apache.brooklyn.rest.util.json.BrooklynJacksonJsonProvider; + import brooklyn.util.guava.Maybe; import brooklyn.util.task.Tasks; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ActivityResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ActivityResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ActivityResource.java index 27bf71f..05df81a 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ActivityResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ActivityResource.java @@ -24,8 +24,9 @@ import java.util.List; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.BrooklynTaskTags.WrappedStream; -import brooklyn.management.HasTaskChildren; -import brooklyn.management.Task; + +import org.apache.brooklyn.management.HasTaskChildren; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.rest.api.ActivityApi; import org.apache.brooklyn.rest.domain.TaskSummary; import org.apache.brooklyn.rest.transform.TaskTransformer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java index c1e6392..1dad480 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java @@ -22,7 +22,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static javax.ws.rs.core.Response.created; import static javax.ws.rs.core.Response.status; import static javax.ws.rs.core.Response.Status.ACCEPTED; - import brooklyn.entity.basic.EntityPredicates; import brooklyn.util.text.Strings; import io.brooklyn.camp.spi.AssemblyTemplate; @@ -59,13 +58,14 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; import brooklyn.event.basic.Sensors; import brooklyn.location.Location; -import brooklyn.management.Task; import brooklyn.management.entitlement.EntitlementPredicates; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.Entitlements.EntityAndItem; import brooklyn.management.entitlement.Entitlements.StringAndArgument; import brooklyn.management.internal.EntityManagementUtils; import brooklyn.management.internal.EntityManagementUtils.CreationResult; + +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.rest.api.ApplicationApi; import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.ApplicationSummary; @@ -78,6 +78,7 @@ import org.apache.brooklyn.rest.transform.EntityTransformer; import org.apache.brooklyn.rest.transform.TaskTransformer; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; import org.apache.brooklyn.rest.util.WebResourceUtils; + import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java index b6040ec..0196198 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java @@ -35,10 +35,11 @@ import com.google.common.collect.FluentIterable; import brooklyn.entity.Effector; import brooklyn.entity.basic.EntityLocal; -import brooklyn.management.Task; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.Entitlements.StringAndArgument; import brooklyn.management.internal.EffectorUtils; + +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.rest.api.EffectorApi; import org.apache.brooklyn.rest.domain.EffectorSummary; import org.apache.brooklyn.rest.domain.SummaryComparators; @@ -46,6 +47,7 @@ import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.EffectorTransformer; import org.apache.brooklyn.rest.transform.TaskTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; + import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java index efb9680..1157df1 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java @@ -44,11 +44,12 @@ import brooklyn.entity.basic.BrooklynTags.NamedStringTag; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.EntityLocal; import brooklyn.location.Location; -import brooklyn.management.Task; import brooklyn.management.entitlement.EntitlementPredicates; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.internal.EntityManagementUtils; import brooklyn.management.internal.EntityManagementUtils.CreationResult; + +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.rest.api.EntityApi; import org.apache.brooklyn.rest.domain.EntitySummary; import org.apache.brooklyn.rest.domain.LocationSummary; @@ -59,6 +60,7 @@ import org.apache.brooklyn.rest.transform.LocationTransformer; import org.apache.brooklyn.rest.transform.LocationTransformer.LocationDetailLevel; import org.apache.brooklyn.rest.transform.TaskTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; + import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableList; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java index 1df507f..9787a49 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java @@ -52,16 +52,17 @@ import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils; import brooklyn.entity.rebind.persister.FileBasedObjectStore; import brooklyn.entity.rebind.persister.PersistenceObjectStore; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; -import brooklyn.management.entitlement.EntitlementContext; import brooklyn.management.entitlement.Entitlements; -import brooklyn.management.ha.HighAvailabilityManager; -import brooklyn.management.ha.HighAvailabilityMode; -import brooklyn.management.ha.ManagementNodeState; -import brooklyn.management.ha.ManagementPlaneSyncRecord; -import brooklyn.management.ha.MementoCopyMode; import brooklyn.management.internal.ManagementContextInternal; + +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.management.entitlement.EntitlementContext; +import org.apache.brooklyn.management.ha.HighAvailabilityManager; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementNodeState; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.management.ha.MementoCopyMode; import org.apache.brooklyn.rest.api.ServerApi; import org.apache.brooklyn.rest.domain.BrooklynFeatureSummary; import org.apache.brooklyn.rest.domain.HighAvailabilitySummary; @@ -70,6 +71,7 @@ import org.apache.brooklyn.rest.transform.BrooklynFeatureTransformer; import org.apache.brooklyn.rest.transform.HighAvailabilityTransformer; import org.apache.brooklyn.rest.util.ShutdownHandler; import org.apache.brooklyn.rest.util.WebResourceUtils; + import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/BrooklynUserWithRandomPasswordSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/BrooklynUserWithRandomPasswordSecurityProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/BrooklynUserWithRandomPasswordSecurityProvider.java index 7315e4d..283e977 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/BrooklynUserWithRandomPasswordSecurityProvider.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/BrooklynUserWithRandomPasswordSecurityProvider.java @@ -22,9 +22,9 @@ import javax.servlet.http.HttpSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.filter.BrooklynPropertiesSecurityFilter; + import brooklyn.util.net.Networking; import brooklyn.util.text.Identifiers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/DelegatingSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/DelegatingSecurityProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/DelegatingSecurityProvider.java index 98d5776..cfaea87 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/DelegatingSecurityProvider.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/DelegatingSecurityProvider.java @@ -27,8 +27,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.StringConfigMap; -import brooklyn.management.ManagementContext; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.BrooklynWebConfig; + import brooklyn.util.text.Strings; public class DelegatingSecurityProvider implements SecurityProvider { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java index 37f3aca..348f406 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java @@ -29,7 +29,8 @@ import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynProperties; import brooklyn.config.StringConfigMap; -import brooklyn.management.ManagementContext; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.BrooklynWebConfig; import org.apache.brooklyn.rest.security.PasswordHasher; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/LdapSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/LdapSecurityProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/LdapSecurityProvider.java index 151772a..7b0a9c8 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/LdapSecurityProvider.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/LdapSecurityProvider.java @@ -31,10 +31,13 @@ import org.slf4j.LoggerFactory; import com.google.common.base.CharMatcher; import brooklyn.config.StringConfigMap; -import brooklyn.management.ManagementContext; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.BrooklynWebConfig; + import brooklyn.util.exceptions.Exceptions; import brooklyn.util.text.Strings; + import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/HighAvailabilityTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/HighAvailabilityTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/HighAvailabilityTransformer.java index 438ae82..6a0192e 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/HighAvailabilityTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/HighAvailabilityTransformer.java @@ -21,8 +21,8 @@ package org.apache.brooklyn.rest.transform; import java.net.URI; import java.util.Map; -import brooklyn.management.ha.ManagementPlaneSyncRecord; -import brooklyn.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.management.ha.ManagementPlaneSyncRecord; import org.apache.brooklyn.rest.domain.HighAvailabilitySummary; import org.apache.brooklyn.rest.domain.HighAvailabilitySummary.HaNodeSummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java index 1daf543..8ada101 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java @@ -30,9 +30,11 @@ import brooklyn.location.LocationDefinition; import brooklyn.location.basic.BasicLocationDefinition; import brooklyn.location.basic.LocationConfigKeys; import brooklyn.location.basic.LocationInternal; -import brooklyn.management.ManagementContext; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.domain.LocationSummary; import org.apache.brooklyn.rest.util.WebResourceUtils; + import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.guava.Maybe; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java index 308b623..6db2e40 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java @@ -33,11 +33,13 @@ import org.slf4j.LoggerFactory; import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.BrooklynTaskTags.WrappedStream; -import brooklyn.management.HasTaskChildren; -import brooklyn.management.Task; + +import org.apache.brooklyn.management.HasTaskChildren; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.rest.domain.LinkWithMetadata; import org.apache.brooklyn.rest.domain.TaskSummary; import org.apache.brooklyn.rest.util.WebResourceUtils; + import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.task.TaskInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 ccb40e8..aa94352 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 @@ -58,12 +58,12 @@ import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; import brooklyn.location.LocationRegistry; -import brooklyn.management.ManagementContext; -import brooklyn.management.Task; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.Entitlements.StringAndArgument; import brooklyn.policy.basic.AbstractPolicy; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.EntitySpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/EntityLocationUtils.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/EntityLocationUtils.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/EntityLocationUtils.java index d1c02e8..c8492fb 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/EntityLocationUtils.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/EntityLocationUtils.java @@ -21,10 +21,11 @@ package org.apache.brooklyn.rest.util; import java.util.LinkedHashMap; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; + import brooklyn.entity.Entity; import brooklyn.location.Location; import brooklyn.location.basic.LocationConfigKeys; -import brooklyn.management.ManagementContext; public class EntityLocationUtils { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/ManagementContextProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/ManagementContextProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/ManagementContextProvider.java index 4b24f05..2c677e3 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/ManagementContextProvider.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/ManagementContextProvider.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.rest.util; import javax.ws.rs.core.Context; -import brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ManagementContext; import com.sun.jersey.spi.inject.SingletonTypeInjectableProvider; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java index 434962e..697fcdd 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java @@ -21,6 +21,7 @@ package org.apache.brooklyn.rest.util.json; import java.io.IOException; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.JsonGenerator; import org.codehaus.jackson.JsonParser; @@ -34,7 +35,6 @@ import org.codehaus.jackson.map.module.SimpleModule; import brooklyn.basic.BrooklynObject; import brooklyn.entity.Entity; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; public class BidiSerialization { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 7362c6d..4929ee8 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 @@ -22,6 +22,7 @@ import javax.servlet.ServletContext; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.brooklyn.management.ManagementContext; import org.codehaus.jackson.Version; import org.codehaus.jackson.jaxrs.JacksonJsonProvider; import org.codehaus.jackson.map.ObjectMapper; @@ -35,7 +36,6 @@ import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServiceAttributes; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.management.ManagementContext; import brooklyn.management.ManagementContextInjectable; public class BrooklynJacksonJsonProvider extends JacksonJsonProvider implements ManagementContextInjectable { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/test/java/org/apache/brooklyn/entity/brooklynnode/DeployBlueprintTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/entity/brooklynnode/DeployBlueprintTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/entity/brooklynnode/DeployBlueprintTest.java index 68d8e9a..6047bea 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/entity/brooklynnode/DeployBlueprintTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/entity/brooklynnode/DeployBlueprintTest.java @@ -37,9 +37,11 @@ import brooklyn.entity.brooklynnode.BrooklynNode; import brooklyn.entity.brooklynnode.BrooklynNode.DeployBlueprintEffector; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.feed.http.JsonFunctions; -import brooklyn.management.EntityManager; + +import org.apache.brooklyn.management.EntityManager; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; import org.apache.brooklyn.test.HttpTestUtils; + import brooklyn.util.guava.Functionals; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 5fc2670..d43007a 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 @@ -45,9 +45,10 @@ import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.BrooklynServiceAttributes; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.internal.ManagementContextInternal; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.filter.BrooklynPropertiesSecurityFilter; import org.apache.brooklyn.rest.filter.HaMasterCheckFilter; import org.apache.brooklyn.rest.filter.LoggingFilter; @@ -58,6 +59,7 @@ import org.apache.brooklyn.rest.security.provider.SecurityProvider; import org.apache.brooklyn.rest.util.ManagementContextProvider; import org.apache.brooklyn.rest.util.ShutdownHandlerProvider; import org.apache.brooklyn.rest.util.TestShutdownHandler; + import brooklyn.util.exceptions.Exceptions; import brooklyn.util.net.Networking; import brooklyn.util.text.WildcardGlobs; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 5f2f0c6..b0b851d 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,11 @@ import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.BrooklynServiceAttributes; import brooklyn.entity.basic.Entities; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider; + import brooklyn.util.exceptions.Exceptions; public abstract class BrooklynRestApiLauncherTestFixture { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 f78e196..3226b75 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 @@ -26,11 +26,12 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.management.ha.HighAvailabilityManager; -import brooklyn.management.ha.HighAvailabilityMode; -import brooklyn.management.ha.ManagementNodeState; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.internal.ManagementContextInternal; + +import org.apache.brooklyn.management.ha.HighAvailabilityManager; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementNodeState; 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/f7f03580/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java index e2b6875..22347a8 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java @@ -37,11 +37,13 @@ import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindTestUtils; -import brooklyn.management.EntityManager; -import brooklyn.management.ManagementContext; -import brooklyn.management.ha.HighAvailabilityMode; -import brooklyn.management.ha.ManagementNodeState; + +import org.apache.brooklyn.management.EntityManager; +import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider; + import brooklyn.test.Asserts; import brooklyn.util.http.HttpTool; import brooklyn.util.http.HttpToolResponse; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/ApplicationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/ApplicationTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/ApplicationTest.java index 43330c4..72936fb 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/ApplicationTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/ApplicationTest.java @@ -27,12 +27,12 @@ import java.io.IOException; import java.net.URI; import java.util.Map; +import org.apache.brooklyn.management.ManagementContext; import org.testng.Assert; import org.testng.annotations.Test; import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; -import brooklyn.management.ManagementContext; import brooklyn.test.entity.TestApplicationImpl; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java index 551b16c..915317b 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java @@ -36,8 +36,10 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; import brooklyn.event.basic.Sensors; -import brooklyn.management.ManagementContext; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.transform.SensorTransformer; + import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ScriptResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ScriptResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ScriptResourceTest.java index 58418bc..ccf9408 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ScriptResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ScriptResourceTest.java @@ -25,7 +25,8 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.location.Location; -import brooklyn.management.ManagementContext; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.domain.ScriptExecutionSummary; import org.apache.brooklyn.rest.testing.mocks.RestMockApp; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java index 4262384..d393e68 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java @@ -32,11 +32,13 @@ import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.management.ManagementContext; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.BrooklynRestApiLauncher; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; import org.apache.brooklyn.test.HttpTestUtils; + import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.collections.MutableList; import brooklyn.util.http.HttpTool; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 7f70971..b9d7bc2 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,13 +33,15 @@ import org.eclipse.jetty.server.Server; import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.internal.ManagementContextInternal; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.BrooklynRestApiLauncher; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; import org.apache.brooklyn.rest.security.provider.TestSecurityProvider; import org.apache.brooklyn.test.HttpTestUtils; + import brooklyn.util.http.HttpTool; import brooklyn.util.http.HttpToolResponse; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 978d8a2..cacc22d 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 @@ -44,11 +44,13 @@ import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.EmptySoftwareProcessDriver; import brooklyn.entity.basic.EmptySoftwareProcessImpl; import brooklyn.entity.proxying.ImplementedBy; -import brooklyn.management.ManagementContext; import brooklyn.management.internal.ManagementContextInternal; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.domain.HighAvailabilitySummary; import org.apache.brooklyn.rest.domain.VersionSummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; + import brooklyn.test.Asserts; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerShutdownTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerShutdownTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerShutdownTest.java index a74f22a..763bc1d 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerShutdownTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerShutdownTest.java @@ -47,10 +47,12 @@ import brooklyn.entity.drivers.BasicEntityDriverManager; import brooklyn.entity.drivers.ReflectiveEntityDriverFactory; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; -import brooklyn.management.EntityManager; -import brooklyn.management.Task; + +import org.apache.brooklyn.management.EntityManager; +import org.apache.brooklyn.management.Task; import org.apache.brooklyn.rest.resources.ServerResourceTest.StopLatchEntity; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; + import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/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 252c972..9d1cc85 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 @@ -33,9 +33,10 @@ import com.sun.jersey.test.framework.LowLevelAppDescriptor; import brooklyn.entity.basic.Entities; import brooklyn.location.LocationRegistry; import brooklyn.location.basic.BasicLocationRegistry; -import brooklyn.management.ManagementContext; import brooklyn.management.ManagementContextInjectable; import brooklyn.management.internal.LocalManagementContext; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.BrooklynRestApi; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTest; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; @@ -44,6 +45,7 @@ import org.apache.brooklyn.rest.util.NullServletConfigProvider; import org.apache.brooklyn.rest.util.ShutdownHandlerProvider; import org.apache.brooklyn.rest.util.TestShutdownHandler; import org.apache.brooklyn.rest.util.json.BrooklynJacksonJsonProvider; + import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java index 8e16198..1ae8d45 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java @@ -41,8 +41,10 @@ import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; -import brooklyn.management.ManagementContext; + +import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.rest.BrooklynRestApiLauncher; + import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f7f03580/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java ---------------------------------------------------------------------- diff --git a/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java b/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java index 3bceb78..5a16d55 100644 --- a/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java +++ b/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java @@ -28,6 +28,8 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.management.SubscriptionHandle; + import brooklyn.config.ConfigKey; import brooklyn.entity.Entity; import brooklyn.entity.Group; @@ -35,7 +37,6 @@ import brooklyn.entity.basic.EntityLocal; import brooklyn.event.AttributeSensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.management.SubscriptionHandle; import brooklyn.test.Asserts; import com.google.common.annotations.Beta;
