BROOKLYN-162 - apply org.apache package prefix to policy project (a few outstanding items)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/16519be5 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/16519be5 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/16519be5 Branch: refs/heads/0.8.0-incubating Commit: 16519be5ba3414d74e55c00e2c57148b5278af42 Parents: 951bad8 Author: Alex Heneveld <[email protected]> Authored: Tue Aug 18 21:14:34 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Aug 18 21:32:46 2015 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/demo/WebClusterDatabaseExample.java | 4 +--- .../apache/brooklyn/demo/WebClusterDatabaseExampleApp.java | 4 +--- .../RebindWebClusterDatabaseExampleAppIntegrationTest.java | 4 +--- .../brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java | 4 ++-- .../apache/brooklyn/entity/webapp/WebAppServiceMethods.java | 8 +++----- .../brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java | 2 +- .../org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java | 2 +- 7 files changed, 10 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/16519be5/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java index 3906a75..a22a8a6 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java @@ -27,9 +27,6 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.enricher.HttpLatencyDetector; - import org.apache.brooklyn.entity.core.AbstractApplication; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.StartableApplication; @@ -44,6 +41,7 @@ import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; +import org.apache.brooklyn.policy.enricher.HttpLatencyDetector; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.CommandLineUtil; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/16519be5/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java index aafe287..a988440 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java @@ -37,9 +37,6 @@ 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.entity.webapp.WebAppServiceConstants; - -import brooklyn.enricher.HttpLatencyDetector; - import org.apache.brooklyn.entity.core.AbstractApplication; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.StartableApplication; @@ -51,6 +48,7 @@ import brooklyn.entity.java.JavaEntityMethods; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; +import org.apache.brooklyn.policy.enricher.HttpLatencyDetector; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.CommandLineUtil; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/16519be5/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java b/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java index 88d4265..c302141 100644 --- a/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java +++ b/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java @@ -52,9 +52,6 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.enricher.HttpLatencyDetector; - import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.StartableApplication; import org.apache.brooklyn.entity.database.mysql.MySqlNode; @@ -63,6 +60,7 @@ import org.apache.brooklyn.entity.group.DynamicCluster; import brooklyn.entity.java.JavaEntityMethods; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; +import org.apache.brooklyn.policy.enricher.HttpLatencyDetector; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/16519be5/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java index 3b29242..aabb0eb 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java @@ -42,8 +42,6 @@ import org.apache.brooklyn.entity.core.Entities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.enricher.RollingTimeWindowMeanEnricher; -import brooklyn.enricher.TimeWeightedDeltaEnricher; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.entity.java.JavaAppUtils; import brooklyn.event.feed.jmx.JmxAttributePollConfig; @@ -53,6 +51,8 @@ import brooklyn.event.feed.jmx.JmxOperationPollConfig; import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.cloud.CloudLocationConfig; +import org.apache.brooklyn.policy.enricher.RollingTimeWindowMeanEnricher; +import org.apache.brooklyn.policy.enricher.TimeWeightedDeltaEnricher; import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.sensor.feed.function.FunctionFeed; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/16519be5/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMethods.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMethods.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMethods.java index ec58d16..00c3806 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMethods.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMethods.java @@ -25,12 +25,10 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.internal.EntityLocal; - -import brooklyn.enricher.RollingTimeWindowMeanEnricher; -import brooklyn.enricher.TimeFractionDeltaEnricher; -import brooklyn.enricher.TimeWeightedDeltaEnricher; - import org.apache.brooklyn.location.access.BrooklynAccessUtils; +import org.apache.brooklyn.policy.enricher.RollingTimeWindowMeanEnricher; +import org.apache.brooklyn.policy.enricher.TimeFractionDeltaEnricher; +import org.apache.brooklyn.policy.enricher.TimeWeightedDeltaEnricher; import org.apache.brooklyn.util.time.Duration; import com.google.common.net.HostAndPort; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/16519be5/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 4f645de..5a26985 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 @@ -38,7 +38,7 @@ import org.apache.brooklyn.camp.spi.AssemblyTemplate; import org.apache.brooklyn.camp.spi.PlatformComponent; import org.apache.brooklyn.camp.spi.PlatformRootSummary; import org.apache.brooklyn.camp.spi.collection.ResolvableLink; -import org.apache.brooklyn.core.BrooklynTaskTags; +import org.apache.brooklyn.core.mgmt.BrooklynTaskTags; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.lifecycle.Lifecycle; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/16519be5/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java index d8cd4f0..76b1ecf 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java @@ -44,6 +44,7 @@ import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; +import org.apache.brooklyn.policy.enricher.HttpLatencyDetector; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.util.CommandLineUtil; import org.apache.brooklyn.util.collections.MutableSet; @@ -53,7 +54,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import brooklyn.enricher.HttpLatencyDetector; import brooklyn.entity.java.JavaEntityMethods; /**
