BROOKLYN-162 - update archetype sample for 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/3588137a Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3588137a Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3588137a Branch: refs/heads/master Commit: 3588137a599575cf8ffaa1f99a6c2980c475978e Parents: a5676ed Author: Alex Heneveld <[email protected]> Authored: Tue Aug 18 15:20:39 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Aug 18 15:20:39 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/sample/app/ClusterWebServerDatabaseSample.java | 6 +++--- .../acme/sample/brooklyn/sample/app/SingleWebServerSample.java | 4 ++-- .../brooklyn/sample/app/SampleLocalhostIntegrationTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3588137a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java ---------------------------------------------------------------------- diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java index 0049316..cd18511 100644 --- a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java +++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java @@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.catalog.CatalogConfig; -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; import brooklyn.enricher.HttpLatencyDetector; import brooklyn.enricher.basic.SensorPropagatingEnricher; import brooklyn.enricher.basic.SensorTransformingEnricher; @@ -31,8 +31,8 @@ import org.apache.brooklyn.api.event.AttributeSensor; import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; -import brooklyn.util.maven.MavenArtifact; -import brooklyn.util.maven.MavenRetriever; +import org.apache.brooklyn.util.maven.MavenArtifact; +import org.apache.brooklyn.util.maven.MavenRetriever; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3588137a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/SingleWebServerSample.java ---------------------------------------------------------------------- diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/SingleWebServerSample.java b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/SingleWebServerSample.java index ac241de..4452bd6 100644 --- a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/SingleWebServerSample.java +++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/SingleWebServerSample.java @@ -9,8 +9,8 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.location.basic.PortRanges; -import brooklyn.util.maven.MavenArtifact; -import brooklyn.util.maven.MavenRetriever; +import org.apache.brooklyn.util.maven.MavenArtifact; +import org.apache.brooklyn.util.maven.MavenRetriever; /** This example starts one web app on 8080. */ public class SingleWebServerSample extends AbstractApplication { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3588137a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java index f679425..373a012 100644 --- a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java +++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java @@ -18,7 +18,7 @@ import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.util.ResourceUtils; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.Strings; /** * Sample integration tests which show how to launch the sample applications on localhost,
