http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java index 4a099e9..3d65881 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java @@ -30,10 +30,10 @@ import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.management.SubscriptionHandle; +import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.entity.proxy.AbstractControllerImpl; import org.apache.brooklyn.entity.proxy.ProxySslConfig; import org.apache.brooklyn.entity.proxy.nginx.NginxController.NginxControllerInternal; -import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java index 6437c67..ff60237 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java @@ -26,12 +26,12 @@ import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.proxying.EntityInitializer; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.policy.Enricher; +import org.apache.brooklyn.api.policy.EnricherSpec; +import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.camp.brooklyn.BrooklynCampReservedKeys; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynYamlTypeInstantiator.InstantiatorFromKey; -import org.apache.brooklyn.policy.Enricher; -import org.apache.brooklyn.policy.EnricherSpec; -import org.apache.brooklyn.policy.Policy; -import org.apache.brooklyn.policy.PolicySpec; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/BrooklynYamlTypeInstantiatorTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/BrooklynYamlTypeInstantiatorTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/BrooklynYamlTypeInstantiatorTest.java index aa6b7c1..d984db2 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/BrooklynYamlTypeInstantiatorTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/BrooklynYamlTypeInstantiatorTest.java @@ -19,10 +19,10 @@ package org.apache.brooklyn.camp.brooklyn; import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; +import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynYamlTypeInstantiator; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynYamlTypeInstantiator.Factory; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynYamlTypeInstantiator.InstantiatorFromKey; -import org.apache.brooklyn.policy.Policy; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java index 4c13d26..bf8dc15 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java index f322ea5..94b3f66 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java @@ -35,12 +35,12 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.WebAppService; -import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/PoliciesYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/PoliciesYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/PoliciesYamlTest.java index 43753fc..e020c68 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/PoliciesYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/PoliciesYamlTest.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.policy.Policy; +import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java index 6b220fd..0f326ad 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java @@ -33,14 +33,14 @@ import org.apache.brooklyn.api.catalog.CatalogItem.CatalogItemType; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynEntityMatcher; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.management.osgi.OsgiVersionMoreEntityTest; -import org.apache.brooklyn.policy.Policy; -import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.TestResourceUnavailableException; import brooklyn.util.ResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlCombiTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlCombiTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlCombiTest.java index 85d5fb5..73bb59b 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlCombiTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlCombiTest.java @@ -24,8 +24,8 @@ import org.testng.Assert; import org.testng.annotations.Test; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; -import org.apache.brooklyn.policy.Policy; import brooklyn.entity.basic.BasicEntity; import brooklyn.entity.basic.BasicStartable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java index e44be71..10c60fb 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java @@ -23,13 +23,13 @@ import static org.testng.Assert.assertEquals; import org.testng.annotations.Test; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; import brooklyn.catalog.CatalogPredicates; import brooklyn.event.basic.BasicConfigKey; import brooklyn.management.osgi.OsgiStandaloneTest; -import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.test.TestResourceUnavailableException; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java index 99d0b2e..8d50dde 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java @@ -21,9 +21,9 @@ package org.apache.brooklyn.camp.brooklyn.catalog; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; +import org.apache.brooklyn.api.policy.Enricher; +import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.camp.brooklyn.AbstractYamlRebindTest; -import org.apache.brooklyn.policy.Enricher; -import org.apache.brooklyn.policy.Policy; import org.testng.annotations.Test; import brooklyn.catalog.internal.CatalogUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java index bb12732..c4f3cd2 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java @@ -38,10 +38,10 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationResolver; +import org.apache.brooklyn.api.policy.Enricher; +import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.cli.lister.ClassFinder; import org.apache.brooklyn.cli.lister.ItemDescriptors; -import org.apache.brooklyn.policy.Enricher; -import org.apache.brooklyn.policy.Policy; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java index cb1c6f0..63ad940 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java @@ -29,8 +29,8 @@ import java.util.Set; import org.apache.brooklyn.api.basic.BrooklynObject; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.policy.Enricher; -import org.apache.brooklyn.policy.Policy; +import org.apache.brooklyn.api.policy.Enricher; +import org.apache.brooklyn.api.policy.Policy; import org.reflections.Reflections; import org.reflections.scanners.FieldAnnotationsScanner; import org.reflections.scanners.SubTypesScanner; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java index 8a7a824..98136f5 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java @@ -27,10 +27,10 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.entity.proxy.nginx.NginxControllerImpl; import org.apache.brooklyn.entity.proxy.nginx.NginxSshDriver; import org.apache.brooklyn.entity.proxy.nginx.UrlMapping; -import org.apache.brooklyn.policy.PolicySpec; import brooklyn.config.ConfigKey; import brooklyn.event.feed.ConfigToAttributes; @@ -38,7 +38,9 @@ import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.function.FunctionPollConfig; import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; + import org.apache.brooklyn.location.basic.SshMachineLocation; + import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java index 326fdc5..8b635f1 100644 --- a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java +++ b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java @@ -29,11 +29,11 @@ import brooklyn.event.basic.Sensors; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.launcher.BrooklynLauncher; -import org.apache.brooklyn.policy.EnricherSpec; import brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.util.CommandLineUtil; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/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 b475ce3..218d729 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 @@ -42,6 +42,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.api.policy.PolicySpec; import brooklyn.catalog.CatalogPredicates; import brooklyn.catalog.internal.BasicBrooklynCatalog; @@ -51,8 +53,6 @@ import brooklyn.catalog.internal.CatalogUtils; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.Entitlements.StringAndArgument; -import org.apache.brooklyn.policy.Policy; -import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.rest.api.CatalogApi; import org.apache.brooklyn.rest.domain.ApiError; import org.apache.brooklyn.rest.domain.CatalogEntitySummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/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 c0fa8eb..b4aa5ce 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,7 +29,7 @@ import brooklyn.management.entitlement.Entitlements; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; -import org.apache.brooklyn.policy.Policy; +import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.rest.api.PolicyConfigApi; import org.apache.brooklyn.rest.domain.PolicyConfigSummary; import org.apache.brooklyn.rest.filter.HaHotStateRequired; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/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 8ebc13a..31a3b99 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 @@ -30,8 +30,8 @@ import brooklyn.policy.basic.Policies; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; -import org.apache.brooklyn.policy.Policy; -import org.apache.brooklyn.policy.PolicySpec; +import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.rest.api.PolicyApi; import org.apache.brooklyn.rest.domain.PolicySummary; import org.apache.brooklyn.rest.domain.Status; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/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 9c7f64c..2afd4c3 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 @@ -35,12 +35,12 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.api.policy.PolicySpec; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.EntityDynamicType; -import org.apache.brooklyn.policy.Policy; -import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.rest.domain.CatalogEntitySummary; import org.apache.brooklyn.rest.domain.CatalogItemSummary; import org.apache.brooklyn.rest.domain.CatalogLocationSummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/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 a7cd50b..a43127c 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,7 +26,7 @@ import brooklyn.policy.basic.Policies; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; -import org.apache.brooklyn.policy.Policy; +import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.rest.domain.ApplicationSummary; import org.apache.brooklyn.rest.domain.PolicyConfigSummary; import org.apache.brooklyn.rest.domain.PolicySummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/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 5218c99..a14bc22 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 @@ -49,6 +49,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.api.policy.Policy; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.config.ConfigKey; @@ -64,7 +65,6 @@ import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.Entitlements.StringAndArgument; import brooklyn.policy.basic.AbstractPolicy; -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/904f9508/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 104e508..71e161a 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 @@ -31,6 +31,7 @@ import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.policy.Policy; import brooklyn.catalog.internal.CatalogItemBuilder; import brooklyn.catalog.internal.CatalogTemplateItemDto; @@ -42,7 +43,6 @@ import brooklyn.entity.proxying.EntityProxy; import brooklyn.management.internal.LocalManagementContext; import brooklyn.policy.basic.AbstractPolicy; -import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.EntitySpec; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java index 7594c2c..238d743 100644 --- a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java +++ b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java @@ -20,7 +20,7 @@ package brooklyn.osgi.tests.more; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.effector.EffectorBody; -import org.apache.brooklyn.policy.PolicySpec; +import org.apache.brooklyn.api.policy.PolicySpec; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/904f9508/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java index ff86a3d..327fd23 100644 --- a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java +++ b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreEntityImpl.java @@ -20,7 +20,7 @@ package brooklyn.osgi.tests.more; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.effector.EffectorBody; -import org.apache.brooklyn.policy.PolicySpec; +import org.apache.brooklyn.api.policy.PolicySpec; import brooklyn.util.config.ConfigBag;
