BROOKLYN-162 - update qa project for recent refactoring
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8a0a361b Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8a0a361b Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8a0a361b Branch: refs/heads/master Commit: 8a0a361baf3d74c16b385b4e6d4d27033076792b Parents: 3588137 Author: Alex Heneveld <[email protected]> Authored: Tue Aug 18 15:24:04 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Aug 18 15:24:04 2015 +0100 ---------------------------------------------------------------------- .../qa/load/SimulatedJBoss7ServerImpl.java | 16 ++++----- .../qa/load/SimulatedMySqlNodeImpl.java | 19 +++++----- .../qa/load/SimulatedNginxControllerImpl.java | 14 ++++---- .../brooklyn/qa/load/SimulatedTheeTierApp.java | 31 ++++++++-------- .../apache/brooklyn/qa/longevity/Monitor.java | 9 +++-- .../brooklyn/qa/longevity/MonitorUtils.java | 3 +- .../SoftlayerObtainPrivateLiveTest.java | 38 ++++++++++---------- .../org/apache/brooklyn/qa/load/LoadTest.java | 29 +++++++-------- .../brooklyn/qa/longevity/MonitorUtilsTest.java | 8 ++--- .../webcluster/SinusoidalLoadGenerator.java | 8 ++--- .../qa/longevity/webcluster/WebClusterApp.java | 17 +++++---- 11 files changed, 89 insertions(+), 103 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8a0a361b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java index a3241af..692eb1a 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java @@ -22,10 +22,17 @@ import static java.lang.String.format; import java.util.concurrent.Callable; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.entity.webapp.jboss.JBoss7ServerImpl; import org.apache.brooklyn.entity.webapp.jboss.JBoss7SshDriver; +import org.apache.brooklyn.location.access.BrooklynAccessUtils; +import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.guava.Functionals; +import org.apache.brooklyn.util.os.Os; + +import com.google.common.net.HostAndPort; -import brooklyn.config.ConfigKey; import brooklyn.enricher.Enrichers; import brooklyn.entity.basic.Attributes; import brooklyn.event.feed.function.FunctionFeed; @@ -33,13 +40,6 @@ import brooklyn.event.feed.function.FunctionPollConfig; import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.event.feed.http.HttpValueFunctions; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; -import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.guava.Functionals; -import brooklyn.util.os.Os; - -import com.google.common.net.HostAndPort; /** * For simulating various aspects of the JBoss 7 app-server entity. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8a0a361b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java index 7b44dc5..d1ff2e9 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java @@ -22,23 +22,22 @@ import static java.lang.String.format; import java.util.concurrent.Callable; -import brooklyn.config.ConfigKey; -import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.entity.database.mysql.MySqlNodeImpl; import org.apache.brooklyn.entity.database.mysql.MySqlSshDriver; +import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.CountdownTimer; +import org.apache.brooklyn.util.time.Duration; + +import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.function.FunctionPollConfig; -import org.apache.brooklyn.core.util.task.DynamicTasks; -import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; -import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.CountdownTimer; -import brooklyn.util.time.Duration; - /** * @see SimulatedJBoss7ServerImpl for description of purpose and configuration options. */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8a0a361b/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 98136f5..a340f10 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 @@ -28,24 +28,22 @@ 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.config.ConfigKey; 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.location.basic.SshMachineLocation; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; + +import com.google.common.base.Functions; -import brooklyn.config.ConfigKey; import brooklyn.event.feed.ConfigToAttributes; 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; - -import com.google.common.base.Functions; - /** * @see SimulatedJBoss7ServerImpl for description of purpose and configuration options. */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8a0a361b/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 140f72b..41a756e 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 @@ -24,20 +24,9 @@ import static brooklyn.event.basic.DependentConfiguration.formatString; import java.util.Collection; import java.util.List; -import brooklyn.config.ConfigKey; -import brooklyn.enricher.Enrichers; -import brooklyn.enricher.HttpLatencyDetector; -import brooklyn.entity.basic.AbstractApplication; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.StartableApplication; -import org.apache.brooklyn.entity.database.mysql.MySqlNode; -import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.java.JavaEntityMethods; -import brooklyn.entity.trait.Startable; - import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; @@ -46,17 +35,27 @@ import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; 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 brooklyn.util.CommandLineUtil; -import brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.CommandLineUtil; +import org.apache.brooklyn.util.collections.MutableSet; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; +import brooklyn.enricher.Enrichers; +import brooklyn.enricher.HttpLatencyDetector; +import brooklyn.entity.basic.AbstractApplication; +import brooklyn.entity.basic.Attributes; +import brooklyn.entity.basic.ConfigKeys; +import brooklyn.entity.basic.Entities; +import brooklyn.entity.basic.StartableApplication; +import brooklyn.entity.group.DynamicCluster; +import brooklyn.entity.java.JavaEntityMethods; +import brooklyn.entity.trait.Startable; + /** * A 3-tier app where all components are just "simulated" - they don't actually run * real app-servers or databases, instead just executing a "sleep" command to simulate http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8a0a361b/usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/Monitor.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/Monitor.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/Monitor.java index 7a3ea42..b5ae0e4 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/Monitor.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/Monitor.java @@ -18,11 +18,11 @@ */ package org.apache.brooklyn.qa.longevity; +import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.brooklyn.qa.longevity.StatusRecorder.Factory.chain; import static org.apache.brooklyn.qa.longevity.StatusRecorder.Factory.noop; import static org.apache.brooklyn.qa.longevity.StatusRecorder.Factory.toFile; import static org.apache.brooklyn.qa.longevity.StatusRecorder.Factory.toLog; -import static java.util.concurrent.TimeUnit.SECONDS; import java.io.File; import java.io.IOException; @@ -38,13 +38,12 @@ import java.util.concurrent.atomic.AtomicReference; import joptsimple.OptionParser; import joptsimple.OptionSet; +import org.apache.brooklyn.util.collections.TimeWindowedList; +import org.apache.brooklyn.util.collections.TimestampedValue; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.collections.TimeWindowedList; -import brooklyn.util.collections.TimestampedValue; -import brooklyn.util.time.Duration; - import com.google.common.base.Charsets; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8a0a361b/usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java index 9dbfe0a..72523e0 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java @@ -37,11 +37,10 @@ import java.util.regex.Pattern; import org.apache.brooklyn.core.util.http.HttpTool; import org.apache.brooklyn.core.util.http.HttpToolResponse; +import org.apache.brooklyn.util.stream.StreamGobbler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.stream.StreamGobbler; - import com.google.common.base.Objects; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8a0a361b/usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java b/usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java index a08cdd6..430b9b8 100644 --- a/usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java +++ b/usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java @@ -23,16 +23,33 @@ import java.util.Collection; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.basic.BrooklynObjectInternal.ConfigurationSupportInternal; +import org.apache.brooklyn.core.util.BrooklynMavenArtifacts; +import org.apache.brooklyn.launcher.BrooklynLauncher; +import org.apache.brooklyn.location.jclouds.JcloudsLocationConfig; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.maven.MavenRetriever; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.basic.BrooklynObjectInternal.ConfigurationSupportInternal; +import com.google.common.base.Joiner; +import com.google.common.base.Predicates; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; + import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; @@ -41,25 +58,6 @@ import brooklyn.entity.brooklynnode.BrooklynEntityMirror; import brooklyn.entity.brooklynnode.BrooklynNode; import brooklyn.entity.brooklynnode.BrooklynNode.DeployBlueprintEffector; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.api.location.Location; -import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.core.util.BrooklynMavenArtifacts; -import org.apache.brooklyn.launcher.BrooklynLauncher; -import org.apache.brooklyn.location.jclouds.JcloudsLocationConfig; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.maven.MavenRetriever; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; - -import com.google.common.base.Joiner; -import com.google.common.base.Predicates; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; - /** * Tests obtaining a machine with a private IP only. For the machine to be * accessible we should have a gateway machine already running in the same http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8a0a361b/usage/qa/src/test/java/org/apache/brooklyn/qa/load/LoadTest.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/test/java/org/apache/brooklyn/qa/load/LoadTest.java b/usage/qa/src/test/java/org/apache/brooklyn/qa/load/LoadTest.java index 4b5b1b1..ea0d945 100644 --- a/usage/qa/src/test/java/org/apache/brooklyn/qa/load/LoadTest.java +++ b/usage/qa/src/test/java/org/apache/brooklyn/qa/load/LoadTest.java @@ -18,8 +18,6 @@ */ package org.apache.brooklyn.qa.load; -import org.apache.brooklyn.test.PerformanceTestUtils; - import static org.testng.Assert.assertEquals; import java.io.File; @@ -30,26 +28,20 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.StartableApplication; -import brooklyn.entity.rebind.persister.PersistMode; -import brooklyn.entity.trait.Startable; - import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.launcher.BrooklynLauncher; - -import brooklyn.util.os.Os; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.test.PerformanceTestUtils; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.time.Duration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableList; @@ -60,6 +52,11 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; +import brooklyn.entity.basic.Entities; +import brooklyn.entity.basic.StartableApplication; +import brooklyn.entity.rebind.persister.PersistMode; +import brooklyn.entity.trait.Startable; + /** * Customers ask about the scalability of Brooklyn. These load tests investigate how many * concurrent apps can be deployed and managed by a single Brooklyn management node. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8a0a361b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/MonitorUtilsTest.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/MonitorUtilsTest.java b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/MonitorUtilsTest.java index cf377e9..f58963c 100644 --- a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/MonitorUtilsTest.java +++ b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/MonitorUtilsTest.java @@ -18,7 +18,6 @@ */ package org.apache.brooklyn.qa.longevity; -import org.apache.brooklyn.qa.longevity.MonitorUtils; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -31,11 +30,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.testng.annotations.Test; - import org.apache.brooklyn.qa.longevity.MonitorUtils.ProcessHasStderr; -import brooklyn.util.os.Os; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.Strings; +import org.testng.annotations.Test; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8a0a361b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java index edf2a18..7dfac29 100644 --- a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java +++ b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java @@ -24,16 +24,16 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.enricher.basic.AbstractEnricher; -import brooklyn.entity.basic.ConfigKeys; - import com.google.common.base.Throwables; import com.google.common.reflect.TypeToken; +import brooklyn.enricher.basic.AbstractEnricher; +import brooklyn.entity.basic.ConfigKeys; + /** * Periodically publishes values in the range of 0 to #amplitude. * The value varies sinusoidally over time. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8a0a361b/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 399f847..be9fd20 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 @@ -20,26 +20,25 @@ package org.apache.brooklyn.qa.longevity.webcluster; import java.util.List; -import brooklyn.config.BrooklynProperties; -import brooklyn.enricher.Enrichers; -import brooklyn.entity.basic.AbstractApplication; -import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.StartableApplication; -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.core.config.BrooklynProperties; 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.autoscaling.AutoScalerPolicy; -import brooklyn.util.CommandLineUtil; +import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.collect.Lists; +import brooklyn.enricher.Enrichers; +import brooklyn.entity.basic.AbstractApplication; +import brooklyn.entity.basic.Entities; +import brooklyn.entity.basic.StartableApplication; +import brooklyn.event.basic.Sensors; + public class WebClusterApp extends AbstractApplication { static BrooklynProperties config = BrooklynProperties.Factory.newDefault();
