Fix imports to org.apache.brooklyn Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/64a19837 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/64a19837 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/64a19837
Branch: refs/heads/master Commit: 64a19837b8c953f8ef5f8efad68f23ffd1ed4388 Parents: 36fb5e9 Author: Aled Sage <[email protected]> Authored: Tue Aug 11 17:16:30 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Tue Aug 11 20:04:33 2015 +0100 ---------------------------------------------------------------------- .../apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy | 2 +- .../entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java | 2 +- .../entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java | 2 +- .../nosql/infinispan/Infinispan5ServerIntegrationTest.groovy | 2 +- .../TomcatServerDisableRetrieveUsageMetricsIntegrationTest.java | 2 +- .../test/java/io/brooklyn/camp/brooklyn/ApplicationsYamlTest.java | 1 + .../java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64a19837/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy index d40fcc5..bcd4903 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy @@ -22,6 +22,7 @@ import static brooklyn.entity.java.JavaEntityMethods.javaSysProp import static brooklyn.event.basic.DependentConfiguration.attributeWhenReady import static brooklyn.event.basic.DependentConfiguration.formatString +import org.apache.brooklyn.launcher.BrooklynLauncher import org.slf4j.Logger import org.slf4j.LoggerFactory @@ -31,7 +32,6 @@ import brooklyn.entity.database.mysql.MySqlNode import brooklyn.entity.proxying.EntitySpec import brooklyn.entity.webapp.ControlledDynamicWebAppCluster import brooklyn.entity.webapp.DynamicWebAppCluster -import brooklyn.launcher.BrooklynLauncher import brooklyn.policy.autoscaling.AutoScalerPolicy import brooklyn.util.CommandLineUtil http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64a19837/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java index 552ad02..0afb49b 100644 --- a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java +++ b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java @@ -20,6 +20,7 @@ package org.apache.brooklyn.entity.nosql.hazelcast; import org.apache.brooklyn.entity.nosql.hazelcast.HazelcastCluster; import org.apache.brooklyn.entity.nosql.hazelcast.HazelcastNode; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; @@ -28,7 +29,6 @@ import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.basic.Attributes; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; -import brooklyn.test.EntityTestUtils; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64a19837/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java index 03d95af..7e05c74 100644 --- a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java +++ b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java @@ -20,6 +20,7 @@ package org.apache.brooklyn.entity.nosql.hazelcast; import org.apache.brooklyn.entity.nosql.hazelcast.HazelcastCluster; import org.apache.brooklyn.entity.nosql.hazelcast.HazelcastNode; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; @@ -28,7 +29,6 @@ import brooklyn.entity.AbstractSoftlayerLiveTest; import brooklyn.entity.basic.Attributes; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; -import brooklyn.test.EntityTestUtils; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64a19837/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy index b7d8d1a..1287e2a 100644 --- a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy +++ b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.nosql.infinispan -import static brooklyn.test.TestUtils.* +import static org.apache.brooklyn.test.TestUtils.* import static java.util.concurrent.TimeUnit.* import static org.testng.Assert.* http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64a19837/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerDisableRetrieveUsageMetricsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerDisableRetrieveUsageMetricsIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerDisableRetrieveUsageMetricsIntegrationTest.java index 0761af6..ed300c4 100644 --- a/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerDisableRetrieveUsageMetricsIntegrationTest.java +++ b/software/webapp/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerDisableRetrieveUsageMetricsIntegrationTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.webapp.tomcat; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppLiveTestSupport; @@ -28,7 +29,6 @@ import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64a19837/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/ApplicationsYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/ApplicationsYamlTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/ApplicationsYamlTest.java index 3f860d6..1bd904d 100644 --- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/ApplicationsYamlTest.java +++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/ApplicationsYamlTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64a19837/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java index 48ecb42..3a24b51 100644 --- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java +++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java @@ -20,7 +20,7 @@ package io.brooklyn.camp.brooklyn.catalog; import org.testng.annotations.Test; -import io.brooklyn.camp.brooklyn.AbstractYamlTest; +import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; public class CatalogYamlAppTest extends AbstractYamlTest {
