http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 861a7e6..f5c1b4d 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 @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynServiceAttributes; import brooklyn.management.ManagementContext; import brooklyn.management.ha.ManagementNodeState; -import brooklyn.rest.domain.ApiError; +import org.apache.brooklyn.rest.domain.ApiError; import org.apache.brooklyn.rest.util.WebResourceUtils; import brooklyn.util.text.Strings;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AccessResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AccessResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AccessResource.java index a948254..73a3d14 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AccessResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AccessResource.java @@ -22,8 +22,8 @@ import javax.ws.rs.core.Response; import brooklyn.management.internal.AccessManager; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.rest.api.AccessApi; -import brooklyn.rest.domain.AccessSummary; +import org.apache.brooklyn.rest.api.AccessApi; +import org.apache.brooklyn.rest.domain.AccessSummary; import org.apache.brooklyn.rest.transform.AccessTransformer; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 53a49d3..27bf71f 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 @@ -26,8 +26,8 @@ import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.BrooklynTaskTags.WrappedStream; import brooklyn.management.HasTaskChildren; import brooklyn.management.Task; -import brooklyn.rest.api.ActivityApi; -import brooklyn.rest.domain.TaskSummary; +import org.apache.brooklyn.rest.api.ActivityApi; +import org.apache.brooklyn.rest.domain.TaskSummary; import org.apache.brooklyn.rest.transform.TaskTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 962d6cf..c1e6392 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 @@ -66,12 +66,12 @@ import brooklyn.management.entitlement.Entitlements.EntityAndItem; import brooklyn.management.entitlement.Entitlements.StringAndArgument; import brooklyn.management.internal.EntityManagementUtils; import brooklyn.management.internal.EntityManagementUtils.CreationResult; -import brooklyn.rest.api.ApplicationApi; -import brooklyn.rest.domain.ApplicationSpec; -import brooklyn.rest.domain.ApplicationSummary; -import brooklyn.rest.domain.EntitySpec; -import brooklyn.rest.domain.EntitySummary; -import brooklyn.rest.domain.TaskSummary; +import org.apache.brooklyn.rest.api.ApplicationApi; +import org.apache.brooklyn.rest.domain.ApplicationSpec; +import org.apache.brooklyn.rest.domain.ApplicationSummary; +import org.apache.brooklyn.rest.domain.EntitySpec; +import org.apache.brooklyn.rest.domain.EntitySummary; +import org.apache.brooklyn.rest.domain.TaskSummary; import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.ApplicationTransformer; import org.apache.brooklyn.rest.transform.EntityTransformer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java index 2367429..09864b3 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java @@ -52,12 +52,12 @@ import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.Entitlements.StringAndArgument; import brooklyn.policy.Policy; import brooklyn.policy.PolicySpec; -import brooklyn.rest.api.CatalogApi; -import brooklyn.rest.domain.ApiError; -import brooklyn.rest.domain.CatalogEntitySummary; -import brooklyn.rest.domain.CatalogItemSummary; -import brooklyn.rest.domain.CatalogLocationSummary; -import brooklyn.rest.domain.CatalogPolicySummary; +import org.apache.brooklyn.rest.api.CatalogApi; +import org.apache.brooklyn.rest.domain.ApiError; +import org.apache.brooklyn.rest.domain.CatalogEntitySummary; +import org.apache.brooklyn.rest.domain.CatalogItemSummary; +import org.apache.brooklyn.rest.domain.CatalogLocationSummary; +import org.apache.brooklyn.rest.domain.CatalogPolicySummary; import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.CatalogTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 c60c808..b6040ec 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 @@ -39,9 +39,9 @@ import brooklyn.management.Task; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.Entitlements.StringAndArgument; import brooklyn.management.internal.EffectorUtils; -import brooklyn.rest.api.EffectorApi; -import brooklyn.rest.domain.EffectorSummary; -import brooklyn.rest.domain.SummaryComparators; +import org.apache.brooklyn.rest.api.EffectorApi; +import org.apache.brooklyn.rest.domain.EffectorSummary; +import org.apache.brooklyn.rest.domain.SummaryComparators; import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.EffectorTransformer; import org.apache.brooklyn.rest.transform.TaskTransformer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java index bee9d32..b7636f6 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java @@ -33,8 +33,8 @@ import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.EntityLocal; import brooklyn.event.basic.BasicConfigKey; import brooklyn.management.entitlement.Entitlements; -import brooklyn.rest.api.EntityConfigApi; -import brooklyn.rest.domain.EntityConfigSummary; +import org.apache.brooklyn.rest.api.EntityConfigApi; +import org.apache.brooklyn.rest.domain.EntityConfigSummary; import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.EntityTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 44ce884..efb9680 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 @@ -49,10 +49,10 @@ import brooklyn.management.entitlement.EntitlementPredicates; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.internal.EntityManagementUtils; import brooklyn.management.internal.EntityManagementUtils.CreationResult; -import brooklyn.rest.api.EntityApi; -import brooklyn.rest.domain.EntitySummary; -import brooklyn.rest.domain.LocationSummary; -import brooklyn.rest.domain.TaskSummary; +import org.apache.brooklyn.rest.api.EntityApi; +import org.apache.brooklyn.rest.domain.EntitySummary; +import org.apache.brooklyn.rest.domain.LocationSummary; +import org.apache.brooklyn.rest.domain.TaskSummary; import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.EntityTransformer; import org.apache.brooklyn.rest.transform.LocationTransformer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java index 5618683..23bf1a9 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java @@ -35,9 +35,9 @@ import brooklyn.catalog.internal.CatalogUtils; import brooklyn.location.Location; import brooklyn.location.LocationDefinition; import brooklyn.location.basic.LocationConfigKeys; -import brooklyn.rest.api.LocationApi; -import brooklyn.rest.domain.LocationSpec; -import brooklyn.rest.domain.LocationSummary; +import org.apache.brooklyn.rest.api.LocationApi; +import org.apache.brooklyn.rest.domain.LocationSpec; +import org.apache.brooklyn.rest.domain.LocationSummary; import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.LocationTransformer; import org.apache.brooklyn.rest.transform.LocationTransformer.LocationDetailLevel; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyConfigResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyConfigResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyConfigResource.java index 359810b..04c74e7 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyConfigResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyConfigResource.java @@ -29,8 +29,8 @@ import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityLocal; import brooklyn.management.entitlement.Entitlements; import brooklyn.policy.Policy; -import brooklyn.rest.api.PolicyConfigApi; -import brooklyn.rest.domain.PolicyConfigSummary; +import org.apache.brooklyn.rest.api.PolicyConfigApi; +import org.apache.brooklyn.rest.domain.PolicyConfigSummary; import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.PolicyTransformer; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java index 341dd43..0b35923 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java @@ -31,10 +31,10 @@ import brooklyn.entity.basic.EntityLocal; import brooklyn.policy.Policy; import brooklyn.policy.PolicySpec; import brooklyn.policy.basic.Policies; -import brooklyn.rest.api.PolicyApi; -import brooklyn.rest.domain.PolicySummary; -import brooklyn.rest.domain.Status; -import brooklyn.rest.domain.SummaryComparators; +import org.apache.brooklyn.rest.api.PolicyApi; +import org.apache.brooklyn.rest.domain.PolicySummary; +import org.apache.brooklyn.rest.domain.Status; +import org.apache.brooklyn.rest.domain.SummaryComparators; import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.ApplicationTransformer; import org.apache.brooklyn.rest.transform.PolicyTransformer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ScriptResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ScriptResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ScriptResource.java index 4137263..513a07e 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ScriptResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ScriptResource.java @@ -18,8 +18,8 @@ */ package org.apache.brooklyn.rest.resources; -import brooklyn.rest.api.ScriptApi; -import brooklyn.rest.domain.ScriptExecutionSummary; +import org.apache.brooklyn.rest.api.ScriptApi; +import org.apache.brooklyn.rest.domain.ScriptExecutionSummary; import brooklyn.util.stream.ThreadLocalPrintStream; import brooklyn.util.stream.ThreadLocalPrintStream.OutputCapturingContext; import groovy.lang.Binding; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java index 6689829..d27eb38 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java @@ -33,8 +33,8 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.management.entitlement.Entitlements; -import brooklyn.rest.api.SensorApi; -import brooklyn.rest.domain.SensorSummary; +import org.apache.brooklyn.rest.api.SensorApi; +import org.apache.brooklyn.rest.domain.SensorSummary; import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.SensorTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 24d2e0c..1df507f 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 @@ -62,10 +62,10 @@ import brooklyn.management.ha.ManagementNodeState; import brooklyn.management.ha.ManagementPlaneSyncRecord; import brooklyn.management.ha.MementoCopyMode; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.rest.api.ServerApi; -import brooklyn.rest.domain.BrooklynFeatureSummary; -import brooklyn.rest.domain.HighAvailabilitySummary; -import brooklyn.rest.domain.VersionSummary; +import org.apache.brooklyn.rest.api.ServerApi; +import org.apache.brooklyn.rest.domain.BrooklynFeatureSummary; +import org.apache.brooklyn.rest.domain.HighAvailabilitySummary; +import org.apache.brooklyn.rest.domain.VersionSummary; import org.apache.brooklyn.rest.transform.BrooklynFeatureTransformer; import org.apache.brooklyn.rest.transform.HighAvailabilityTransformer; import org.apache.brooklyn.rest.util.ShutdownHandler; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/UsageResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/UsageResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/UsageResource.java index 315dedb..936de70 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/UsageResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/UsageResource.java @@ -35,9 +35,9 @@ import brooklyn.management.internal.ManagementContextInternal; import brooklyn.management.usage.ApplicationUsage; import brooklyn.management.usage.ApplicationUsage.ApplicationEvent; import brooklyn.management.usage.LocationUsage; -import brooklyn.rest.api.UsageApi; -import brooklyn.rest.domain.UsageStatistic; -import brooklyn.rest.domain.UsageStatistics; +import org.apache.brooklyn.rest.api.UsageApi; +import org.apache.brooklyn.rest.domain.UsageStatistic; +import org.apache.brooklyn.rest.domain.UsageStatistics; import org.apache.brooklyn.rest.transform.ApplicationTransformer; import brooklyn.util.exceptions.UserFacingException; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/VersionResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/VersionResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/VersionResource.java index dc6db6f..78a0006 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/VersionResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/VersionResource.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.rest.resources; import brooklyn.BrooklynVersion; -import brooklyn.rest.api.VersionApi; +import org.apache.brooklyn.rest.api.VersionApi; /** @deprecated since 0.7.0; use /v1/server/version */ @Deprecated http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/AccessTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/AccessTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/AccessTransformer.java index e0ebe2a..4a0807f 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/AccessTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/AccessTransformer.java @@ -21,7 +21,7 @@ package org.apache.brooklyn.rest.transform; import java.net.URI; import brooklyn.management.internal.AccessManager; -import brooklyn.rest.domain.AccessSummary; +import org.apache.brooklyn.rest.domain.AccessSummary; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/ApplicationTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/ApplicationTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/ApplicationTransformer.java index 2ba84d9..92841ad 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/ApplicationTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/ApplicationTransformer.java @@ -18,14 +18,14 @@ */ package org.apache.brooklyn.rest.transform; -import static brooklyn.rest.domain.Status.ACCEPTED; -import static brooklyn.rest.domain.Status.RUNNING; -import static brooklyn.rest.domain.Status.STARTING; -import static brooklyn.rest.domain.Status.STOPPED; -import static brooklyn.rest.domain.Status.STOPPING; -import static brooklyn.rest.domain.Status.UNKNOWN; -import static brooklyn.rest.domain.Status.DESTROYED; -import static brooklyn.rest.domain.Status.ERROR; +import static org.apache.brooklyn.rest.domain.Status.ACCEPTED; +import static org.apache.brooklyn.rest.domain.Status.RUNNING; +import static org.apache.brooklyn.rest.domain.Status.STARTING; +import static org.apache.brooklyn.rest.domain.Status.STOPPED; +import static org.apache.brooklyn.rest.domain.Status.STOPPING; +import static org.apache.brooklyn.rest.domain.Status.UNKNOWN; +import static org.apache.brooklyn.rest.domain.Status.DESTROYED; +import static org.apache.brooklyn.rest.domain.Status.ERROR; import java.net.URI; import java.util.Collection; @@ -39,9 +39,9 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; -import brooklyn.rest.domain.ApplicationSpec; -import brooklyn.rest.domain.ApplicationSummary; -import brooklyn.rest.domain.Status; +import org.apache.brooklyn.rest.domain.ApplicationSpec; +import org.apache.brooklyn.rest.domain.ApplicationSummary; +import org.apache.brooklyn.rest.domain.Status; import com.google.common.base.Function; import com.google.common.collect.Collections2; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/BrooklynFeatureTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/BrooklynFeatureTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/BrooklynFeatureTransformer.java index 37d1643..d39df1d 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/BrooklynFeatureTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/BrooklynFeatureTransformer.java @@ -22,7 +22,7 @@ package org.apache.brooklyn.rest.transform; import com.google.common.base.Function; import brooklyn.BrooklynVersion.BrooklynFeature; -import brooklyn.rest.domain.BrooklynFeatureSummary; +import org.apache.brooklyn.rest.domain.BrooklynFeatureSummary; public class BrooklynFeatureTransformer { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java index 8620142..721b52a 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java @@ -38,16 +38,16 @@ import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.policy.Policy; import brooklyn.policy.PolicySpec; -import brooklyn.rest.domain.CatalogEntitySummary; -import brooklyn.rest.domain.CatalogItemSummary; -import brooklyn.rest.domain.CatalogLocationSummary; -import brooklyn.rest.domain.CatalogPolicySummary; -import brooklyn.rest.domain.EffectorSummary; -import brooklyn.rest.domain.EntityConfigSummary; -import brooklyn.rest.domain.LocationConfigSummary; -import brooklyn.rest.domain.PolicyConfigSummary; -import brooklyn.rest.domain.SensorSummary; -import brooklyn.rest.domain.SummaryComparators; +import org.apache.brooklyn.rest.domain.CatalogEntitySummary; +import org.apache.brooklyn.rest.domain.CatalogItemSummary; +import org.apache.brooklyn.rest.domain.CatalogLocationSummary; +import org.apache.brooklyn.rest.domain.CatalogPolicySummary; +import org.apache.brooklyn.rest.domain.EffectorSummary; +import org.apache.brooklyn.rest.domain.EntityConfigSummary; +import org.apache.brooklyn.rest.domain.LocationConfigSummary; +import org.apache.brooklyn.rest.domain.PolicyConfigSummary; +import org.apache.brooklyn.rest.domain.SensorSummary; +import org.apache.brooklyn.rest.domain.SummaryComparators; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java index 3489942..6c6e0ee 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java @@ -27,8 +27,8 @@ import brooklyn.entity.Effector; import brooklyn.entity.Entity; import brooklyn.entity.ParameterType; import brooklyn.entity.basic.EntityLocal; -import brooklyn.rest.domain.EffectorSummary; -import brooklyn.rest.domain.EffectorSummary.ParameterSummary; +import org.apache.brooklyn.rest.domain.EffectorSummary; +import org.apache.brooklyn.rest.domain.EffectorSummary.ParameterSummary; import org.apache.brooklyn.rest.util.WebResourceUtils; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java index 3ba7cd8..659559a 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java @@ -31,8 +31,8 @@ import brooklyn.config.render.RendererHints; import brooklyn.entity.Application; import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityLocal; -import brooklyn.rest.domain.EntityConfigSummary; -import brooklyn.rest.domain.EntitySummary; +import org.apache.brooklyn.rest.domain.EntityConfigSummary; +import org.apache.brooklyn.rest.domain.EntitySummary; import org.apache.brooklyn.rest.util.WebResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.URLParamEncoder; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 61d0f49..438ae82 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 @@ -23,8 +23,8 @@ import java.util.Map; import brooklyn.management.ha.ManagementPlaneSyncRecord; import brooklyn.management.ha.ManagementNodeSyncRecord; -import brooklyn.rest.domain.HighAvailabilitySummary; -import brooklyn.rest.domain.HighAvailabilitySummary.HaNodeSummary; +import org.apache.brooklyn.rest.domain.HighAvailabilitySummary; +import org.apache.brooklyn.rest.domain.HighAvailabilitySummary.HaNodeSummary; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 240845e..1daf543 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 @@ -31,7 +31,7 @@ import brooklyn.location.basic.BasicLocationDefinition; import brooklyn.location.basic.LocationConfigKeys; import brooklyn.location.basic.LocationInternal; import brooklyn.management.ManagementContext; -import brooklyn.rest.domain.LocationSummary; +import org.apache.brooklyn.rest.domain.LocationSummary; import org.apache.brooklyn.rest.util.WebResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; @@ -49,11 +49,11 @@ public class LocationTransformer { /** @deprecated since 0.7.0 use method taking management context and detail specifier */ @Deprecated - public static LocationSummary newInstance(String id, brooklyn.rest.domain.LocationSpec locationSpec) { + public static LocationSummary newInstance(String id, org.apache.brooklyn.rest.domain.LocationSpec locationSpec) { return newInstance(null, id, locationSpec, LocationDetailLevel.LOCAL_EXCLUDING_SECRET); } @SuppressWarnings("deprecation") - public static LocationSummary newInstance(ManagementContext mgmt, String id, brooklyn.rest.domain.LocationSpec locationSpec, LocationDetailLevel level) { + public static LocationSummary newInstance(ManagementContext mgmt, String id, org.apache.brooklyn.rest.domain.LocationSpec locationSpec, LocationDetailLevel level) { // TODO: Remove null checks on mgmt when newInstance(String, LocationSpec) is deleted Map<String, ?> config = locationSpec.getConfig(); if (mgmt != null && (level==LocationDetailLevel.FULL_EXCLUDING_SECRET || level==LocationDetailLevel.FULL_INCLUDING_SECRET)) { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java index 6893633..cc3c685 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java @@ -26,9 +26,9 @@ import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityLocal; import brooklyn.policy.Policy; import brooklyn.policy.basic.Policies; -import brooklyn.rest.domain.ApplicationSummary; -import brooklyn.rest.domain.PolicyConfigSummary; -import brooklyn.rest.domain.PolicySummary; +import org.apache.brooklyn.rest.domain.ApplicationSummary; +import org.apache.brooklyn.rest.domain.PolicyConfigSummary; +import org.apache.brooklyn.rest.domain.PolicySummary; import org.apache.brooklyn.rest.resources.PolicyConfigResource; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java index dfa6de0..6fdd744 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java @@ -27,7 +27,7 @@ import brooklyn.config.render.RendererHints; import brooklyn.entity.Entity; import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; -import brooklyn.rest.domain.SensorSummary; +import org.apache.brooklyn.rest.domain.SensorSummary; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.net.URLParamEncoder; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 50b07e8..308b623 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 @@ -35,8 +35,8 @@ import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.BrooklynTaskTags.WrappedStream; import brooklyn.management.HasTaskChildren; import brooklyn.management.Task; -import brooklyn.rest.domain.LinkWithMetadata; -import brooklyn.rest.domain.TaskSummary; +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; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 11df7b5..4f2a09e 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 @@ -62,8 +62,8 @@ import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.Entitlements.StringAndArgument; import brooklyn.policy.Policy; import brooklyn.policy.basic.AbstractPolicy; -import brooklyn.rest.domain.ApplicationSpec; -import brooklyn.rest.domain.EntitySpec; +import org.apache.brooklyn.rest.domain.ApplicationSpec; +import org.apache.brooklyn.rest.domain.EntitySpec; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.flags.TypeCoercions; @@ -333,7 +333,7 @@ public class BrooklynRestResourceUtils { } @SuppressWarnings({ "unchecked", "deprecation" }) - private brooklyn.entity.proxying.EntitySpec<? extends Entity> toCoreEntitySpec(brooklyn.rest.domain.EntitySpec spec) { + private brooklyn.entity.proxying.EntitySpec<? extends Entity> toCoreEntitySpec(org.apache.brooklyn.rest.domain.EntitySpec spec) { String type = spec.getType(); String name = spec.getName(); Map<String, String> config = (spec.getConfig() == null) ? Maps.<String,String>newLinkedHashMap() : Maps.newLinkedHashMap(spec.getConfig()); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 25b3f39..f8b2402 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 @@ -32,8 +32,8 @@ import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.error.YAMLException; import brooklyn.management.entitlement.Entitlements; -import brooklyn.rest.domain.ApiError; -import brooklyn.rest.domain.ApiError.Builder; +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/4c98f111/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java index 67508bb..a8a8f5e 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.catalog.internal.CatalogUtils; -import brooklyn.rest.domain.ApiError; +import org.apache.brooklyn.rest.domain.ApiError; import org.apache.brooklyn.rest.util.json.BrooklynJacksonJsonProvider; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.net.Urls; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 09100f5..43330c4 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 @@ -18,9 +18,9 @@ */ package org.apache.brooklyn.rest.domain; -import static brooklyn.rest.util.RestApiTestUtils.asJson; -import static brooklyn.rest.util.RestApiTestUtils.fromJson; -import static brooklyn.rest.util.RestApiTestUtils.jsonFixture; +import static org.apache.brooklyn.rest.util.RestApiTestUtils.asJson; +import static org.apache.brooklyn.rest.util.RestApiTestUtils.fromJson; +import static org.apache.brooklyn.rest.util.RestApiTestUtils.jsonFixture; import static org.testng.Assert.assertEquals; import java.io.IOException; @@ -33,10 +33,6 @@ import org.testng.annotations.Test; import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; import brooklyn.management.ManagementContext; -import brooklyn.rest.domain.ApplicationSpec; -import brooklyn.rest.domain.ApplicationSummary; -import brooklyn.rest.domain.EntitySpec; -import brooklyn.rest.domain.Status; import brooklyn.test.entity.TestApplicationImpl; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/LocationSummaryTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/LocationSummaryTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/LocationSummaryTest.java index 0df8fcc..7df3de1 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/LocationSummaryTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/LocationSummaryTest.java @@ -18,11 +18,9 @@ */ package org.apache.brooklyn.rest.domain; -import brooklyn.rest.domain.LocationSpec; -import brooklyn.rest.domain.LocationSummary; -import static brooklyn.rest.util.RestApiTestUtils.asJson; -import static brooklyn.rest.util.RestApiTestUtils.fromJson; -import static brooklyn.rest.util.RestApiTestUtils.jsonFixture; +import static org.apache.brooklyn.rest.util.RestApiTestUtils.asJson; +import static org.apache.brooklyn.rest.util.RestApiTestUtils.fromJson; +import static org.apache.brooklyn.rest.util.RestApiTestUtils.jsonFixture; import static org.testng.Assert.assertEquals; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 24e31ec..551b16c 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 @@ -18,9 +18,9 @@ */ package org.apache.brooklyn.rest.domain; -import static brooklyn.rest.util.RestApiTestUtils.asJson; -import static brooklyn.rest.util.RestApiTestUtils.fromJson; -import static brooklyn.rest.util.RestApiTestUtils.jsonFixture; +import static org.apache.brooklyn.rest.util.RestApiTestUtils.asJson; +import static org.apache.brooklyn.rest.util.RestApiTestUtils.fromJson; +import static org.apache.brooklyn.rest.util.RestApiTestUtils.jsonFixture; import static org.testng.Assert.assertEquals; import java.io.IOException; @@ -37,7 +37,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; import brooklyn.event.basic.Sensors; import brooklyn.management.ManagementContext; -import brooklyn.rest.domain.SensorSummary; 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/4c98f111/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/AccessResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/AccessResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/AccessResourceTest.java index edce6ba..0839ea5 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/AccessResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/AccessResourceTest.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import brooklyn.rest.domain.AccessSummary; +import org.apache.brooklyn.rest.domain.AccessSummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import com.sun.jersey.api.client.ClientResponse; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java index 3ae6377..f5a6ed6 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java @@ -32,11 +32,11 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.Test; import brooklyn.entity.basic.Lifecycle; -import brooklyn.rest.domain.ApplicationSpec; -import brooklyn.rest.domain.ApplicationSummary; -import brooklyn.rest.domain.EntitySpec; -import brooklyn.rest.domain.EntitySummary; -import brooklyn.rest.domain.SensorSummary; +import org.apache.brooklyn.rest.domain.ApplicationSpec; +import org.apache.brooklyn.rest.domain.ApplicationSummary; +import org.apache.brooklyn.rest.domain.EntitySpec; +import org.apache.brooklyn.rest.domain.EntitySummary; +import org.apache.brooklyn.rest.domain.SensorSummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java index 047975b..c72339b 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java @@ -64,17 +64,17 @@ import brooklyn.location.basic.AbstractLocation; import brooklyn.location.basic.LocationConfigKeys; import brooklyn.location.basic.LocationInternal; import brooklyn.location.geo.HostGeoInfo; -import brooklyn.rest.domain.ApiError; -import brooklyn.rest.domain.ApplicationSpec; -import brooklyn.rest.domain.ApplicationSummary; -import brooklyn.rest.domain.EffectorSummary; -import brooklyn.rest.domain.EntityConfigSummary; -import brooklyn.rest.domain.EntitySpec; -import brooklyn.rest.domain.EntitySummary; -import brooklyn.rest.domain.PolicySummary; -import brooklyn.rest.domain.SensorSummary; -import brooklyn.rest.domain.Status; -import brooklyn.rest.domain.TaskSummary; +import org.apache.brooklyn.rest.domain.ApiError; +import org.apache.brooklyn.rest.domain.ApplicationSpec; +import org.apache.brooklyn.rest.domain.ApplicationSummary; +import org.apache.brooklyn.rest.domain.EffectorSummary; +import org.apache.brooklyn.rest.domain.EntityConfigSummary; +import org.apache.brooklyn.rest.domain.EntitySpec; +import org.apache.brooklyn.rest.domain.EntitySummary; +import org.apache.brooklyn.rest.domain.PolicySummary; +import org.apache.brooklyn.rest.domain.SensorSummary; +import org.apache.brooklyn.rest.domain.Status; +import org.apache.brooklyn.rest.domain.TaskSummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import org.apache.brooklyn.rest.testing.mocks.CapitalizePolicy; import org.apache.brooklyn.rest.testing.mocks.NameMatcherGroup; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 51024a7..77d9f50 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 @@ -46,10 +46,10 @@ import org.apache.brooklyn.catalog.CatalogItem.CatalogBundle; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.management.osgi.OsgiStandaloneTest; import brooklyn.policy.autoscaling.AutoScalerPolicy; -import brooklyn.rest.domain.CatalogEntitySummary; -import brooklyn.rest.domain.CatalogItemSummary; -import brooklyn.rest.domain.CatalogLocationSummary; -import brooklyn.rest.domain.CatalogPolicySummary; +import org.apache.brooklyn.rest.domain.CatalogEntitySummary; +import org.apache.brooklyn.rest.domain.CatalogItemSummary; +import org.apache.brooklyn.rest.domain.CatalogLocationSummary; +import org.apache.brooklyn.rest.domain.CatalogPolicySummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import org.apache.brooklyn.test.TestResourceUnavailableException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java index 093addf..ea1bafd 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java @@ -37,9 +37,9 @@ import brooklyn.entity.Application; import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityLocal; import brooklyn.event.basic.Sensors; -import brooklyn.rest.domain.ApplicationSpec; -import brooklyn.rest.domain.EntitySpec; -import brooklyn.rest.domain.EntitySummary; +import org.apache.brooklyn.rest.domain.ApplicationSpec; +import org.apache.brooklyn.rest.domain.EntitySpec; +import org.apache.brooklyn.rest.domain.EntitySummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; import brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityConfigResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityConfigResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityConfigResourceTest.java index 66d7315..3d089f7 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityConfigResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityConfigResourceTest.java @@ -38,9 +38,9 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.EntityPredicates; -import brooklyn.rest.domain.ApplicationSpec; -import brooklyn.rest.domain.EntityConfigSummary; -import brooklyn.rest.domain.EntitySpec; +import org.apache.brooklyn.rest.domain.ApplicationSpec; +import org.apache.brooklyn.rest.domain.EntityConfigSummary; +import org.apache.brooklyn.rest.domain.EntitySpec; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityResourceTest.java index bfb4bf3..6f46679 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityResourceTest.java @@ -37,9 +37,9 @@ import brooklyn.entity.Entity; import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.rest.domain.ApplicationSpec; -import brooklyn.rest.domain.EntitySpec; -import brooklyn.rest.domain.TaskSummary; +import org.apache.brooklyn.rest.domain.ApplicationSpec; +import org.apache.brooklyn.rest.domain.EntitySpec; +import org.apache.brooklyn.rest.domain.TaskSummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; import brooklyn.test.HttpTestUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ErrorResponseTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ErrorResponseTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ErrorResponseTest.java index f5dd1e6..0979875 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ErrorResponseTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ErrorResponseTest.java @@ -28,10 +28,10 @@ import javax.ws.rs.core.Response.Status; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import brooklyn.rest.domain.ApiError; -import brooklyn.rest.domain.ApplicationSpec; -import brooklyn.rest.domain.EntitySpec; -import brooklyn.rest.domain.PolicySummary; +import org.apache.brooklyn.rest.domain.ApiError; +import org.apache.brooklyn.rest.domain.ApplicationSpec; +import org.apache.brooklyn.rest.domain.EntitySpec; +import org.apache.brooklyn.rest.domain.PolicySummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; import org.apache.brooklyn.rest.testing.mocks.RestMockSimplePolicy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java index 5109fe9..90ab476 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java @@ -45,8 +45,8 @@ import com.sun.jersey.api.client.GenericType; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; import brooklyn.location.jclouds.JcloudsLocation; -import brooklyn.rest.domain.CatalogLocationSummary; -import brooklyn.rest.domain.LocationSummary; +import org.apache.brooklyn.rest.domain.CatalogLocationSummary; +import org.apache.brooklyn.rest.domain.LocationSummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import brooklyn.test.Asserts; @@ -68,7 +68,7 @@ public class LocationResourceTest extends BrooklynRestResourceTest { "credential", "CR3dential"); ClientResponse response = client().resource("/v1/locations") .type(MediaType.APPLICATION_JSON_TYPE) - .post(ClientResponse.class, new brooklyn.rest.domain.LocationSpec(legacyLocationName, "aws-ec2:us-east-1", expectedConfig)); + .post(ClientResponse.class, new org.apache.brooklyn.rest.domain.LocationSpec(legacyLocationName, "aws-ec2:us-east-1", expectedConfig)); URI addedLegacyLocationUri = response.getLocation(); log.info("added legacy, at: " + addedLegacyLocationUri); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/PolicyResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/PolicyResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/PolicyResourceTest.java index 5c6d6e0..22dc86d 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/PolicyResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/PolicyResourceTest.java @@ -33,10 +33,10 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import brooklyn.rest.domain.ApplicationSpec; -import brooklyn.rest.domain.EntitySpec; -import brooklyn.rest.domain.PolicyConfigSummary; -import brooklyn.rest.domain.PolicySummary; +import org.apache.brooklyn.rest.domain.ApplicationSpec; +import org.apache.brooklyn.rest.domain.EntitySpec; +import org.apache.brooklyn.rest.domain.PolicyConfigSummary; +import org.apache.brooklyn.rest.domain.PolicySummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; import org.apache.brooklyn.rest.testing.mocks.RestMockSimplePolicy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 63ede14..58418bc 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 @@ -26,7 +26,7 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.location.Location; import brooklyn.management.ManagementContext; -import brooklyn.rest.domain.ScriptExecutionSummary; +import org.apache.brooklyn.rest.domain.ScriptExecutionSummary; import org.apache.brooklyn.rest.testing.mocks.RestMockApp; public class ScriptResourceTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java index 0cda8ad..f33820d 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java @@ -35,9 +35,9 @@ import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.EntityPredicates; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; -import brooklyn.rest.api.SensorApi; -import brooklyn.rest.domain.ApplicationSpec; -import brooklyn.rest.domain.EntitySpec; +import org.apache.brooklyn.rest.api.SensorApi; +import org.apache.brooklyn.rest.domain.ApplicationSpec; +import org.apache.brooklyn.rest.domain.EntitySpec; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; import brooklyn.test.HttpTestUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 2d361f8..978d8a2 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 @@ -46,8 +46,8 @@ import brooklyn.entity.basic.EmptySoftwareProcessImpl; import brooklyn.entity.proxying.ImplementedBy; import brooklyn.management.ManagementContext; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.rest.domain.HighAvailabilitySummary; -import brooklyn.rest.domain.VersionSummary; +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/4c98f111/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 98a1a52..a132010 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 @@ -45,12 +45,12 @@ import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; import brooklyn.management.internal.LocalUsageManager; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.rest.domain.ApplicationSpec; -import brooklyn.rest.domain.EntitySpec; -import brooklyn.rest.domain.Status; -import brooklyn.rest.domain.TaskSummary; -import brooklyn.rest.domain.UsageStatistic; -import brooklyn.rest.domain.UsageStatistics; +import org.apache.brooklyn.rest.domain.ApplicationSpec; +import org.apache.brooklyn.rest.domain.EntitySpec; +import org.apache.brooklyn.rest.domain.Status; +import org.apache.brooklyn.rest.domain.TaskSummary; +import org.apache.brooklyn.rest.domain.UsageStatistic; +import org.apache.brooklyn.rest.domain.UsageStatistics; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java index 9db714d..e221033 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java @@ -37,9 +37,9 @@ import org.testng.annotations.BeforeClass; import brooklyn.entity.Application; import brooklyn.entity.basic.Entities; -import brooklyn.rest.domain.ApplicationSpec; -import brooklyn.rest.domain.ApplicationSummary; -import brooklyn.rest.domain.Status; +import org.apache.brooklyn.rest.domain.ApplicationSpec; +import org.apache.brooklyn.rest.domain.ApplicationSummary; +import org.apache.brooklyn.rest.domain.Status; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.repeat.Repeater; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c98f111/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 07aefc9..ae2e6db 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 @@ -42,8 +42,8 @@ import brooklyn.entity.proxying.EntityProxy; import brooklyn.management.internal.LocalManagementContext; import brooklyn.policy.Policy; import brooklyn.policy.basic.AbstractPolicy; -import brooklyn.rest.domain.ApplicationSpec; -import brooklyn.rest.domain.EntitySpec; +import org.apache.brooklyn.rest.domain.ApplicationSpec; +import org.apache.brooklyn.rest.domain.EntitySpec; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestEntityImpl; import brooklyn.util.collections.MutableMap;
