Repository: incubator-brooklyn Updated Branches: refs/heads/master e5289b84c -> d32d672ad
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSimpleIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSimpleIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSimpleIntegrationTest.java index 6683cff..610b990 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSimpleIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSimpleIntegrationTest.java @@ -25,16 +25,14 @@ import java.net.ServerSocket; import java.util.Iterator; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.entity.webapp.nodejs.NodeJsWebAppService; -import org.apache.brooklyn.entity.webapp.nodejs.NodeJsWebAppServiceImpl; import org.jclouds.util.Throwables2; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppLiveTestSupport; -import brooklyn.location.PortRange; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.PortRange; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.PortRanges; import brooklyn.util.net.Networking; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSoftlayerLiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSoftlayerLiveTest.java index cb4a26e..7717d81 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSoftlayerLiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSoftlayerLiveTest.java @@ -23,12 +23,11 @@ import static org.apache.brooklyn.entity.webapp.nodejs.NodeJsWebAppFixtureIntegr import static org.apache.brooklyn.entity.webapp.nodejs.NodeJsWebAppFixtureIntegrationTest.GIT_REPO_URL; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.entity.webapp.nodejs.NodeJsWebAppService; import org.apache.brooklyn.test.HttpTestUtils; import org.testng.annotations.Test; import brooklyn.entity.AbstractSoftlayerLiveTest; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerEc2LiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerEc2LiveTest.java index c9588f8..eb46abe 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerEc2LiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerEc2LiveTest.java @@ -23,11 +23,10 @@ import static org.testng.Assert.assertNotNull; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.test.Asserts; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerSoftlayerLiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerSoftlayerLiveTest.java index c7442e6..8215e7b 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerSoftlayerLiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerSoftlayerLiveTest.java @@ -23,11 +23,10 @@ import static org.testng.Assert.assertNotNull; import org.testng.annotations.Test; import brooklyn.entity.AbstractSoftlayerLiveTest; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.test.Asserts; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerWebAppFixtureIntegrationTest.java index 756662f..2cc62c1 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerWebAppFixtureIntegrationTest.java @@ -35,13 +35,12 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.entity.webapp.AbstractWebAppFixtureIntegrationTest; import org.apache.brooklyn.entity.webapp.HttpsSslConfig; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; -import org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerDisableRetrieveUsageMetricsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerDisableRetrieveUsageMetricsIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerDisableRetrieveUsageMetricsIntegrationTest.java index c238a5d..a4c267d 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerDisableRetrieveUsageMetricsIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerDisableRetrieveUsageMetricsIntegrationTest.java @@ -22,13 +22,12 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppLiveTestSupport; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.test.Asserts; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerEc2LiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerEc2LiveTest.java index f0ee610..0b591a0 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerEc2LiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerEc2LiveTest.java @@ -21,16 +21,13 @@ package org.apache.brooklyn.entity.webapp.tomcat; import static com.google.common.base.Preconditions.checkNotNull; import static org.testng.Assert.assertNotNull; -import java.net.URL; - import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.test.Asserts; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerSoftlayerLiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerSoftlayerLiveTest.java index 61a9c8c..ad9939f 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerSoftlayerLiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerSoftlayerLiveTest.java @@ -21,16 +21,13 @@ package org.apache.brooklyn.entity.webapp.tomcat; import static com.google.common.base.Preconditions.checkNotNull; import static org.testng.Assert.assertNotNull; -import java.net.URL; - import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.testng.annotations.Test; import brooklyn.entity.AbstractSoftlayerLiveTest; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.test.Asserts; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java index c660fdb..8ad5e29 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java @@ -31,7 +31,6 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.entity.webapp.AbstractWebAppFixtureIntegrationTest; import org.apache.brooklyn.entity.webapp.HttpsSslConfig; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; -import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -42,7 +41,7 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.basic.PortRanges; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.repeat.Repeater; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java b/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java index 60f0f2c..09cafd2 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java @@ -32,7 +32,7 @@ import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.basic.SoftwareProcessDriverLifecycleEffectorTasks; import brooklyn.entity.java.VanillaJavaApp; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.util.config.ConfigBag; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/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 71e06b8..c9b73e0 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 @@ -29,7 +29,7 @@ import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; import org.apache.brooklyn.api.event.AttributeSensor; import brooklyn.event.basic.Sensors; -import brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.basic.PortRanges; import brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.util.maven.MavenArtifact; import brooklyn.util.maven.MavenRetriever; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/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 dc1b7bc..ac241de 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 @@ -8,7 +8,7 @@ import brooklyn.entity.basic.Attributes; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; -import brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.basic.PortRanges; import brooklyn.util.maven.MavenArtifact; import brooklyn.util.maven.MavenRetriever; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java index dc6e97a..53c8eeb 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java @@ -53,7 +53,7 @@ import brooklyn.entity.basic.BrooklynTags; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.proxying.InternalEntityFactory; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.management.ManagementContextInjectable; import brooklyn.management.classloading.JavaBrooklynClassLoadingContext; import brooklyn.management.internal.ManagementContextInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlLocationResolver.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlLocationResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlLocationResolver.java index 39b1d5f..298b093 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlLocationResolver.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynYamlLocationResolver.java @@ -24,8 +24,8 @@ import java.util.Map; import org.apache.brooklyn.api.management.ManagementContext; -import brooklyn.location.Location; -import brooklyn.location.LocationDefinition; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.LocationDefinition; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java index 7e4d603..6fb5816 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java @@ -41,14 +41,14 @@ import com.google.common.net.HostAndPort; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.DoNothingSoftwareProcess; import brooklyn.entity.basic.Entities; -import brooklyn.location.MachineLocation; -import brooklyn.location.access.PortForwardManager; -import brooklyn.location.basic.FixedListMachineProvisioningLocation; -import brooklyn.location.basic.LocationPredicates; -import brooklyn.location.basic.Machines; -import brooklyn.location.basic.SshMachineLocation; -import brooklyn.location.basic.WinRmMachineLocation; -import brooklyn.location.cloud.CloudLocationConfig; +import org.apache.brooklyn.location.MachineLocation; +import org.apache.brooklyn.location.access.PortForwardManager; +import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.LocationPredicates; +import org.apache.brooklyn.location.basic.Machines; +import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.basic.WinRmMachineLocation; +import org.apache.brooklyn.location.cloud.CloudLocationConfig; import brooklyn.test.Asserts; import brooklyn.util.net.UserAndHostAndPort; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java index 34cb894..fc942da 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java @@ -29,8 +29,8 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.Entities; -import brooklyn.location.Location; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.Jsonya; @Test http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java index 72f656b..db185da 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java @@ -59,7 +59,7 @@ import brooklyn.entity.basic.SameServerEntity; import brooklyn.entity.effector.Effectors; import brooklyn.entity.group.DynamicCluster; import brooklyn.event.basic.Sensors; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.management.internal.EntityManagerInternal; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java index bcb0fa5..0f8c839 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java @@ -31,12 +31,12 @@ import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.location.Location; -import brooklyn.location.MachineLocation; -import brooklyn.location.basic.FixedListMachineProvisioningLocation; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.MultiLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.MachineLocation; +import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.MultiLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.text.Strings; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestEntityWithInitConfigImpl.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestEntityWithInitConfigImpl.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestEntityWithInitConfigImpl.java index 7c6ea94..82181d5 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestEntityWithInitConfigImpl.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestEntityWithInitConfigImpl.java @@ -25,7 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractEntity; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; public class TestEntityWithInitConfigImpl extends AbstractEntity implements TestEntityWithInitConfig { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java index 2071eb0..19849b3 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java @@ -36,7 +36,7 @@ import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynEntityMatcher; import brooklyn.catalog.internal.CatalogUtils; -import brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.LocationSpec; import brooklyn.management.osgi.OsgiVersionMoreEntityTest; import org.apache.brooklyn.policy.Policy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java index 14e2989..8788d5b 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java @@ -33,10 +33,10 @@ import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; import brooklyn.catalog.CatalogPredicates; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.location.Location; -import brooklyn.location.LocationDefinition; -import brooklyn.location.LocationSpec; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.LocationDefinition; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.management.osgi.OsgiStandaloneTest; import org.apache.brooklyn.test.TestResourceUnavailableException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java index 044042a..ba0a25b 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java @@ -39,12 +39,12 @@ import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.Template; import org.jclouds.compute.options.TemplateOptions; -import brooklyn.location.Location; -import brooklyn.location.LocationDefinition; -import brooklyn.location.basic.LocationConfigKeys; -import brooklyn.location.cloud.CloudLocationConfig; -import brooklyn.location.jclouds.JcloudsLocation; -import brooklyn.location.jclouds.JcloudsUtil; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.LocationDefinition; +import org.apache.brooklyn.location.basic.LocationConfigKeys; +import org.apache.brooklyn.location.cloud.CloudLocationConfig; +import org.apache.brooklyn.location.jclouds.JcloudsLocation; +import org.apache.brooklyn.location.jclouds.JcloudsUtil; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.exceptions.FatalConfigurationRuntimeException; import brooklyn.util.stream.Streams; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java index 5261432..61cc6de 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java @@ -41,8 +41,8 @@ import org.apache.brooklyn.cli.lister.ItemDescriptors; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; -import brooklyn.location.Location; -import brooklyn.location.LocationResolver; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.LocationResolver; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableSet; import brooklyn.util.net.Urls; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ItemDescriptors.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ItemDescriptors.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ItemDescriptors.java index 2ab20b1..11a636d 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ItemDescriptors.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ItemDescriptors.java @@ -39,7 +39,7 @@ import org.apache.brooklyn.api.event.Sensor; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynConfigKeys; -import brooklyn.location.LocationResolver; +import org.apache.brooklyn.location.LocationResolver; import org.apache.brooklyn.rest.domain.EffectorSummary; import org.apache.brooklyn.rest.domain.EntityConfigSummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/cli/src/test/java/org/apache/brooklyn/cli/CliTest.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/test/java/org/apache/brooklyn/cli/CliTest.java b/usage/cli/src/test/java/org/apache/brooklyn/cli/CliTest.java index b70ac33..123acd3 100644 --- a/usage/cli/src/test/java/org/apache/brooklyn/cli/CliTest.java +++ b/usage/cli/src/test/java/org/apache/brooklyn/cli/CliTest.java @@ -44,7 +44,6 @@ import java.util.regex.Pattern; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; -import org.apache.brooklyn.cli.Main; import org.apache.brooklyn.cli.AbstractMain.BrooklynCommand; import org.apache.brooklyn.cli.AbstractMain.BrooklynCommandCollectingArgs; import org.apache.brooklyn.cli.AbstractMain.HelpCommand; @@ -58,12 +57,6 @@ import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.cli.AbstractMain.BrooklynCommand; -import org.apache.brooklyn.cli.AbstractMain.BrooklynCommandCollectingArgs; -import org.apache.brooklyn.cli.AbstractMain.HelpCommand; -import org.apache.brooklyn.cli.Main.AppShutdownHandler; -import org.apache.brooklyn.cli.Main.GeneratePasswordCommand; -import org.apache.brooklyn.cli.Main.LaunchCommand; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.AbstractEntity; @@ -72,8 +65,8 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.proxying.EntityProxy; import brooklyn.entity.trait.Startable; -import brooklyn.location.Location; -import brooklyn.location.basic.SimulatedLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java index 2788426..f5a6b2c 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java @@ -81,11 +81,11 @@ import brooklyn.entity.trait.Startable; import org.apache.brooklyn.launcher.config.StopWhichAppsOnShutdown; import org.apache.brooklyn.mementos.BrooklynMementoRawData; -import brooklyn.location.Location; -import brooklyn.location.LocationSpec; -import brooklyn.location.PortRange; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; -import brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.PortRange; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; +import org.apache.brooklyn.location.basic.PortRanges; import brooklyn.management.ha.HighAvailabilityManagerImpl; import brooklyn.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore; import brooklyn.management.internal.LocalManagementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java index a2a55c7..d63bb68 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java @@ -68,9 +68,9 @@ import brooklyn.internal.BrooklynInitialization; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.launcher.config.CustomResourceLocator; -import brooklyn.location.PortRange; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.PortRange; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.PortRanges; import brooklyn.management.internal.ManagementContextInternal; import org.apache.brooklyn.rest.BrooklynRestApi; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynGlobalConfig.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynGlobalConfig.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynGlobalConfig.java index 2e1b54d..55ed04a 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynGlobalConfig.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynGlobalConfig.java @@ -21,7 +21,7 @@ package org.apache.brooklyn.launcher.config; import brooklyn.config.BrooklynServiceAttributes; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynConfigKeys; -import brooklyn.location.cloud.CloudLocationConfig; +import org.apache.brooklyn.location.cloud.CloudLocationConfig; import brooklyn.management.internal.BrooklynGarbageCollector; import org.apache.brooklyn.rest.BrooklynWebConfig; import brooklyn.util.internal.BrooklynSystemProperties; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java index 2320a33..9489ad4 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java @@ -46,7 +46,7 @@ import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.launcher.SimpleYamlLauncherForTests; import org.apache.brooklyn.launcher.camp.SimpleYamlLauncher; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.util.collections.Jsonya; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java index a34a988..13931e4 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java @@ -45,7 +45,7 @@ import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.PersistenceObjectStore; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableList; import brooklyn.util.exceptions.FatalConfigurationRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java index 8376f31..822a0ed 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java @@ -51,8 +51,8 @@ import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.rebind.RebindTestUtils; -import brooklyn.location.Location; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.util.exceptions.FatalRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/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 e40cae9..a3241af 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 @@ -33,8 +33,8 @@ 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 brooklyn.location.access.BrooklynAccessUtils; -import brooklyn.location.basic.SshMachineLocation; +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; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/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 8a24f73..7570cc5 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 @@ -30,7 +30,7 @@ import brooklyn.entity.database.mysql.MySqlSshDriver; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.function.FunctionPollConfig; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.task.DynamicTasks; import brooklyn.util.task.system.ProcessTaskWrapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/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 db5e97e..8a7a824 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 @@ -38,7 +38,7 @@ 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 brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/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 b017ae1..bc7b2c3 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 @@ -47,7 +47,7 @@ import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.launcher.BrooklynLauncher; -import brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.basic.PortRanges; import brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.util.CommandLineUtil; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/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 a535e91..2748179 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 @@ -45,8 +45,8 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.launcher.BrooklynLauncher; -import brooklyn.location.Location; -import brooklyn.location.jclouds.JcloudsLocationConfig; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.jclouds.JcloudsLocationConfig; import brooklyn.util.BrooklynMavenArtifacts; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/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 ac3629f..e7dc4d4 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,7 +18,6 @@ */ package org.apache.brooklyn.qa.load; -import org.apache.brooklyn.qa.load.SimulatedTheeTierApp; import org.apache.brooklyn.test.PerformanceTestUtils; import static org.testng.Assert.assertEquals; @@ -47,7 +46,7 @@ import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.launcher.BrooklynLauncher; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.os.Os; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationSpec.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationSpec.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationSpec.java index d6b9d41..8cbb9c5 100644 --- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationSpec.java +++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationSpec.java @@ -31,7 +31,7 @@ import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; -// FIXME change name, due to confusion with brooklyn.location.LocationSpec <- no need, as we can kill the class instead soon! +// FIXME change name, due to confusion with LocationSpec <- no need, as we can kill the class instead soon! /** @deprecated since 0.7.0 location spec objects will not be used from the client, instead pass yaml location spec strings */ public class LocationSpec implements HasName, HasConfig, Serializable { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java b/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java index 15697de..be3a690 100644 --- a/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java +++ b/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java @@ -36,7 +36,7 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.StartableApplication; -import brooklyn.location.basic.BasicLocationRegistry; +import org.apache.brooklyn.location.basic.BasicLocationRegistry; import brooklyn.management.internal.LocalManagementContext; import org.apache.brooklyn.api.entity.Application; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java b/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java index dbda216..9c5c20e 100644 --- a/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java +++ b/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java @@ -35,7 +35,7 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; -import brooklyn.location.basic.BasicLocationRegistry; +import org.apache.brooklyn.location.basic.BasicLocationRegistry; import brooklyn.management.internal.LocalManagementContext; import org.apache.brooklyn.api.entity.Application; @@ -45,7 +45,6 @@ import org.apache.brooklyn.rest.BrooklynRestApiLauncherTest; import org.apache.brooklyn.rest.domain.ApplicationSummary; import org.apache.brooklyn.rest.domain.CatalogLocationSummary; import org.apache.brooklyn.rest.security.provider.TestSecurityProvider; -import org.apache.brooklyn.test.HttpTestUtils; @Test public class BrooklynApiRestClientTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynWebConfig.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynWebConfig.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynWebConfig.java index aaabaac..ef9d8e6 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynWebConfig.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynWebConfig.java @@ -22,7 +22,7 @@ import brooklyn.config.ConfigKey; import brooklyn.config.ConfigMap; import brooklyn.config.ConfigPredicates; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.location.PortRange; +import org.apache.brooklyn.location.PortRange; import org.apache.brooklyn.rest.security.provider.DelegatingSecurityProvider; import org.apache.brooklyn.rest.security.provider.ExplicitUsersSecurityProvider; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java index 2073cd8..96b098f 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java @@ -52,7 +52,7 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.Sensors; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.management.entitlement.EntitlementPredicates; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.Entitlements.EntityAndItem; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java index 1ddb219..31ee26c 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java @@ -46,8 +46,8 @@ import brooklyn.catalog.internal.BasicBrooklynCatalog; import brooklyn.catalog.internal.CatalogDto; import brooklyn.catalog.internal.CatalogItemComparator; import brooklyn.catalog.internal.CatalogUtils; -import brooklyn.location.Location; -import brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.LocationSpec; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.Entitlements.StringAndArgument; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java index 19b2df7..bbe921c 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; import brooklyn.entity.basic.BrooklynTags; import brooklyn.entity.basic.BrooklynTags.NamedStringTag; import brooklyn.entity.basic.BrooklynTaskTags; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.management.entitlement.EntitlementPredicates; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.internal.EntityManagementUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java index 60fc3e9..9694747 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java @@ -32,9 +32,9 @@ import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.catalog.CatalogItem; import brooklyn.catalog.internal.CatalogUtils; -import brooklyn.location.Location; -import brooklyn.location.LocationDefinition; -import brooklyn.location.basic.LocationConfigKeys; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.LocationDefinition; +import org.apache.brooklyn.location.basic.LocationConfigKeys; import org.apache.brooklyn.rest.api.LocationApi; import org.apache.brooklyn.rest.domain.LocationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/ApplicationTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/ApplicationTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/ApplicationTransformer.java index e82fc82..18cb2ad 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/ApplicationTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/ApplicationTransformer.java @@ -37,7 +37,7 @@ import javax.annotation.Nullable; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.trait.Startable; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.rest.domain.ApplicationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java index c74ea43..53a0f85 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java @@ -36,8 +36,8 @@ import org.apache.brooklyn.api.event.Sensor; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.EntityDynamicType; -import brooklyn.location.Location; -import brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.LocationSpec; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.policy.PolicySpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java index c2a9267..1e2e8d4 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java @@ -25,11 +25,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Sanitizer; -import brooklyn.location.Location; -import brooklyn.location.LocationDefinition; -import brooklyn.location.basic.BasicLocationDefinition; -import brooklyn.location.basic.LocationConfigKeys; -import brooklyn.location.basic.LocationInternal; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.LocationDefinition; +import org.apache.brooklyn.location.basic.BasicLocationDefinition; +import org.apache.brooklyn.location.basic.LocationConfigKeys; +import org.apache.brooklyn.location.basic.LocationInternal; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.rest.domain.LocationSummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/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 5a2287a..f0de6d9 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 @@ -58,8 +58,8 @@ import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.trait.Startable; -import brooklyn.location.Location; -import brooklyn.location.LocationRegistry; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.LocationRegistry; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.Entitlements.StringAndArgument; import brooklyn.policy.basic.AbstractPolicy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/EntityLocationUtils.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/EntityLocationUtils.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/EntityLocationUtils.java index 076bfa7..20f5eb0 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/EntityLocationUtils.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/EntityLocationUtils.java @@ -24,8 +24,8 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ManagementContext; -import brooklyn.location.Location; -import brooklyn.location.basic.LocationConfigKeys; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.basic.LocationConfigKeys; public class EntityLocationUtils { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java index 046cbe2..f4fe4e9 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BidiSerialization.java @@ -34,7 +34,7 @@ import org.codehaus.jackson.map.JsonSerializer; import org.codehaus.jackson.map.SerializerProvider; import org.codehaus.jackson.map.module.SimpleModule; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; public class BidiSerialization { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java index 20c092b..c4dc88e 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java @@ -59,10 +59,10 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityFunctions; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.basic.Lifecycle; -import brooklyn.location.basic.AbstractLocation; -import brooklyn.location.basic.LocationConfigKeys; -import brooklyn.location.basic.LocationInternal; -import brooklyn.location.geo.HostGeoInfo; +import org.apache.brooklyn.location.basic.AbstractLocation; +import org.apache.brooklyn.location.basic.LocationConfigKeys; +import org.apache.brooklyn.location.basic.LocationInternal; +import org.apache.brooklyn.location.geo.HostGeoInfo; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.basic.EntityLocal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java index 90ab476..25351fe 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java @@ -42,9 +42,9 @@ import com.google.common.collect.Iterables; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.GenericType; -import brooklyn.location.LocationSpec; -import brooklyn.location.basic.SimulatedLocation; -import brooklyn.location.jclouds.JcloudsLocation; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.basic.SimulatedLocation; +import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.rest.domain.CatalogLocationSummary; import org.apache.brooklyn.rest.domain.LocationSummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ScriptResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ScriptResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ScriptResourceTest.java index b31dda0..dae1a6b 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ScriptResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ScriptResourceTest.java @@ -24,7 +24,7 @@ import org.testng.Assert; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.rest.domain.ScriptExecutionSummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java index 57149e4..4e1fd22 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java @@ -38,11 +38,11 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.SoftwareProcessEntityTest; -import brooklyn.location.Location; -import brooklyn.location.LocationSpec; -import brooklyn.location.NoMachinesAvailableException; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.NoMachinesAvailableException; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.management.internal.LocalUsageManager; import brooklyn.management.internal.ManagementContextInternal; import org.apache.brooklyn.rest.domain.ApplicationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java index 3b73ecd..8194547 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java @@ -32,8 +32,8 @@ import com.sun.jersey.test.framework.JerseyTest; import com.sun.jersey.test.framework.LowLevelAppDescriptor; import brooklyn.entity.basic.Entities; -import brooklyn.location.LocationRegistry; -import brooklyn.location.basic.BasicLocationRegistry; +import org.apache.brooklyn.location.LocationRegistry; +import org.apache.brooklyn.location.basic.BasicLocationRegistry; import brooklyn.management.ManagementContextInjectable; import brooklyn.management.internal.LocalManagementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java index af13fa3..04baadf 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java @@ -34,7 +34,7 @@ import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.flags.SetFromFlag; public class RestMockSimpleEntity extends SoftwareProcessImpl { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java index 25f0c28..4647c13 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java @@ -31,10 +31,10 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.location.Location; -import brooklyn.location.basic.AbstractLocation; -import brooklyn.location.basic.LocationInternal; -import brooklyn.location.geo.HostGeoInfo; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.basic.AbstractLocation; +import org.apache.brooklyn.location.basic.LocationInternal; +import org.apache.brooklyn.location.geo.HostGeoInfo; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java index 253a2b0..bf64795 100644 --- a/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java +++ b/utils/test-bundles/entities/src/main/java/brooklyn/osgi/tests/SimpleLocation.java @@ -20,7 +20,7 @@ package brooklyn.osgi.tests; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.location.basic.AbstractLocation; +import org.apache.brooklyn.location.basic.AbstractLocation; import brooklyn.util.flags.SetFromFlag; public class SimpleLocation extends AbstractLocation { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java b/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java index 75a9ff4..19f0f59 100644 --- a/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java +++ b/utils/test-bundles/more-entities-v1/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java @@ -19,7 +19,7 @@ package brooklyn.osgi.tests.more; -import brooklyn.location.basic.AbstractLocation; +import org.apache.brooklyn.location.basic.AbstractLocation; public class MoreLocation extends AbstractLocation { } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java index f2bbbea..dfcf311 100644 --- a/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java +++ b/utils/test-bundles/more-entities-v2/src/main/java/brooklyn/osgi/tests/more/MoreLocation.java @@ -20,7 +20,7 @@ package brooklyn.osgi.tests.more; import org.apache.brooklyn.api.catalog.Catalog; -import brooklyn.location.basic.AbstractLocation; +import org.apache.brooklyn.location.basic.AbstractLocation; @Catalog(name="More Location", description="Cataliog item OSGi test location") public class MoreLocation extends AbstractLocation {
