Repository: incubator-brooklyn Updated Branches: refs/heads/master ff7f58041 -> 6eacb3c38
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6eacb3c3/policy/src/main/java/brooklyn/policy/autoscaling/AutoScalerPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/autoscaling/AutoScalerPolicy.java b/policy/src/main/java/brooklyn/policy/autoscaling/AutoScalerPolicy.java index 9da5e12..18480bd 100644 --- a/policy/src/main/java/brooklyn/policy/autoscaling/AutoScalerPolicy.java +++ b/policy/src/main/java/brooklyn/policy/autoscaling/AutoScalerPolicy.java @@ -40,6 +40,7 @@ import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.core.util.task.Tasks; @@ -52,7 +53,6 @@ import brooklyn.entity.trait.Startable; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.policy.autoscaling.SizeHistory.WindowSummary; -import brooklyn.policy.basic.AbstractPolicy; import brooklyn.policy.loadbalancing.LoadBalancingPolicy; import brooklyn.util.collections.MutableMap; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6eacb3c3/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunPolicy.java b/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunPolicy.java index dde1609..b76682c 100644 --- a/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunPolicy.java +++ b/policy/src/main/java/brooklyn/policy/followthesun/FollowTheSunPolicy.java @@ -38,12 +38,12 @@ import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Attributes; -import brooklyn.policy.basic.AbstractPolicy; import brooklyn.policy.followthesun.FollowTheSunPool.ContainerItemPair; import brooklyn.policy.loadbalancing.Movable; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6eacb3c3/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java b/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java index 0c2f4d2..9d8c58f 100644 --- a/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java +++ b/policy/src/main/java/brooklyn/policy/ha/AbstractFailureDetector.java @@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.core.util.task.BasicTask; import org.apache.brooklyn.core.util.task.ScheduledTask; @@ -38,7 +39,6 @@ import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; -import brooklyn.policy.basic.AbstractPolicy; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6eacb3c3/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java b/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java index 9a869ae..b347949 100644 --- a/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java +++ b/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java @@ -23,13 +23,13 @@ import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.javalang.JavaClassNames; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6eacb3c3/policy/src/main/java/brooklyn/policy/ha/ServiceReplacer.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/ha/ServiceReplacer.java b/policy/src/main/java/brooklyn/policy/ha/ServiceReplacer.java index 884f2df..6bea1d4 100644 --- a/policy/src/main/java/brooklyn/policy/ha/ServiceReplacer.java +++ b/policy/src/main/java/brooklyn/policy/ha/ServiceReplacer.java @@ -35,6 +35,7 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.flags.SetFromFlag; @@ -47,7 +48,6 @@ import brooklyn.entity.group.StopFailedRuntimeException; import brooklyn.entity.trait.MemberReplaceable; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.BasicNotificationSensor; -import brooklyn.policy.basic.AbstractPolicy; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6eacb3c3/policy/src/main/java/brooklyn/policy/ha/ServiceRestarter.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/ha/ServiceRestarter.java b/policy/src/main/java/brooklyn/policy/ha/ServiceRestarter.java index d53434e..ab1359d 100644 --- a/policy/src/main/java/brooklyn/policy/ha/ServiceRestarter.java +++ b/policy/src/main/java/brooklyn/policy/ha/ServiceRestarter.java @@ -28,6 +28,7 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.flags.SetFromFlag; @@ -39,7 +40,6 @@ import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.BasicNotificationSensor; -import brooklyn.policy.basic.AbstractPolicy; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.util.collections.MutableMap; import brooklyn.util.javalang.JavaClassNames; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6eacb3c3/policy/src/main/java/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java b/policy/src/main/java/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java index 2c50883..57b736b 100644 --- a/policy/src/main/java/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java +++ b/policy/src/main/java/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java @@ -35,6 +35,7 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +43,6 @@ import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.EntityInternal; import brooklyn.policy.autoscaling.AutoScalerPolicy; -import brooklyn.policy.basic.AbstractPolicy; import brooklyn.policy.loadbalancing.BalanceableWorkerPool.ContainerItemPair; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6eacb3c3/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestReferencingPolicy.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestReferencingPolicy.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestReferencingPolicy.java index f175e0d..d3f550b 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestReferencingPolicy.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestReferencingPolicy.java @@ -19,10 +19,10 @@ package org.apache.brooklyn.camp.brooklyn; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import brooklyn.config.ConfigKey; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.policy.basic.AbstractPolicy; public class TestReferencingPolicy extends AbstractPolicy { public static final ConfigKey<Entity> TEST_APPLICATION = new BasicConfigKey<Entity>(Entity.class, "test.reference.app"); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6eacb3c3/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 4d22b3f..e25b47a 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 @@ -31,6 +31,7 @@ import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.javalang.UrlClassLoader; import org.reflections.Reflections; @@ -45,7 +46,6 @@ import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.SoftwareProcessImpl; -import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.net.Urls; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6eacb3c3/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 31a3b99..c5ea74a 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 @@ -25,13 +25,11 @@ import javax.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.policy.basic.Policies; - import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.policy.basic.Policies; 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/6eacb3c3/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 a43127c..35e62d6 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 @@ -22,11 +22,11 @@ import java.net.URI; import java.util.Map; import brooklyn.config.ConfigKey; -import brooklyn.policy.basic.Policies; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.core.policy.basic.Policies; 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/6eacb3c3/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 d29b6e8..751eb22 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 @@ -53,6 +53,7 @@ import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.entitlement.Entitlements; import org.apache.brooklyn.core.management.entitlement.Entitlements.StringAndArgument; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.flags.TypeCoercions; import brooklyn.config.ConfigKey; @@ -64,7 +65,6 @@ import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.trait.Startable; -import brooklyn.policy.basic.AbstractPolicy; 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/6eacb3c3/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/CapitalizePolicy.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/CapitalizePolicy.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/CapitalizePolicy.java index d324507..5881990 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/CapitalizePolicy.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/CapitalizePolicy.java @@ -19,8 +19,7 @@ package org.apache.brooklyn.rest.testing.mocks; import org.apache.brooklyn.api.entity.basic.EntityLocal; - -import brooklyn.policy.basic.AbstractPolicy; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; public class CapitalizePolicy extends AbstractPolicy { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6eacb3c3/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java index d6e2b77..f1546ff 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java @@ -20,13 +20,13 @@ package org.apache.brooklyn.rest.testing.mocks; import java.util.Map; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.policy.basic.AbstractPolicy; public class RestMockSimplePolicy extends AbstractPolicy { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6eacb3c3/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 484f6ab..2c5c1d6 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 @@ -36,12 +36,12 @@ import org.apache.brooklyn.core.catalog.internal.CatalogItemBuilder; import org.apache.brooklyn.core.catalog.internal.CatalogTemplateItemDto; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.BasicEntity; import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntityProxy; -import brooklyn.policy.basic.AbstractPolicy; 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/6eacb3c3/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java index f70b60b..a034886 100644 --- a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java +++ b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimplePolicy.java @@ -19,11 +19,11 @@ package brooklyn.osgi.tests; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.entity.basic.ConfigKeys; import brooklyn.config.ConfigKey; -import brooklyn.policy.basic.AbstractPolicy; public class SimplePolicy extends AbstractPolicy { @SetFromFlag("config1") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6eacb3c3/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java b/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java index 50b5945..466d8e2 100644 --- a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java +++ b/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java @@ -20,8 +20,7 @@ package brooklyn.osgi.tests.more; import org.apache.brooklyn.api.catalog.Catalog; - -import brooklyn.policy.basic.AbstractPolicy; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; public class MorePolicy extends AbstractPolicy { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6eacb3c3/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java index 4bfa366..43c53b5 100644 --- a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java +++ b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MorePolicy.java @@ -20,7 +20,7 @@ package brooklyn.osgi.tests.more; import org.apache.brooklyn.api.catalog.Catalog; -import brooklyn.policy.basic.AbstractPolicy; +import org.apache.brooklyn.core.policy.basic.AbstractPolicy; @Catalog(name="More Policy", description="Cataliog item OSGi test policy") public class MorePolicy extends AbstractPolicy {
