http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppEc2LiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppEc2LiveTest.java index 29081bb..a5d5f53 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppEc2LiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppEc2LiveTest.java @@ -23,11 +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.api.location.Location; import org.apache.brooklyn.test.HttpTestUtils; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; -import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppFixtureIntegrationTest.java index 0f82d5d..4cc1522 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppFixtureIntegrationTest.java @@ -21,8 +21,9 @@ package org.apache.brooklyn.entity.webapp.nodejs; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcessDriver; import brooklyn.entity.trait.Startable; -import org.apache.brooklyn.location.Location; + import org.apache.brooklyn.location.basic.PortRanges; + import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Urls; @@ -33,6 +34,7 @@ import com.google.common.collect.ImmutableList; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity; 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.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.nodejs.NodeJsWebAppService; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/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 610b990..e1b10e2 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,14 +25,16 @@ import java.net.ServerSocket; import java.util.Iterator; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.PortRange; import org.jclouds.util.Throwables2; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppLiveTestSupport; -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/d32d672a/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 7717d81..0c6df06 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,11 +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.api.location.Location; import org.apache.brooklyn.test.HttpTestUtils; import org.testng.annotations.Test; import brooklyn.entity.AbstractSoftlayerLiveTest; -import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/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 eb46abe..8d58710 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,10 +23,10 @@ import static org.testng.Assert.assertNotNull; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; -import org.apache.brooklyn.location.Location; import brooklyn.test.Asserts; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/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 8215e7b..595ace4 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,10 +23,10 @@ import static org.testng.Assert.assertNotNull; import org.testng.annotations.Test; import brooklyn.entity.AbstractSoftlayerLiveTest; -import org.apache.brooklyn.location.Location; import brooklyn.test.Asserts; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/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 0b591a0..51a4546 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 @@ -22,12 +22,12 @@ import static com.google.common.base.Preconditions.checkNotNull; import static org.testng.Assert.assertNotNull; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; -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/d32d672a/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 ad9939f..2ff6866 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 @@ -22,12 +22,12 @@ import static com.google.common.base.Preconditions.checkNotNull; import static org.testng.Assert.assertNotNull; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.testng.annotations.Test; import brooklyn.entity.AbstractSoftlayerLiveTest; -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/d32d672a/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 09cafd2..c5967d0 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 @@ -20,6 +20,7 @@ package org.apache.brooklyn.test.entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.entity.webapp.WebAppService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +33,6 @@ import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.basic.SoftwareProcessDriverLifecycleEffectorTasks; import brooklyn.entity.java.VanillaJavaApp; -import org.apache.brooklyn.location.Location; import brooklyn.util.config.ConfigBag; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/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 53c8eeb..d17740d 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 @@ -39,6 +39,7 @@ import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; 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.classloading.BrooklynClassLoadingContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampConstants; @@ -53,7 +54,6 @@ import brooklyn.entity.basic.BrooklynTags; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.proxying.InternalEntityFactory; -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/d32d672a/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 298b093..04a7ac0 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 @@ -22,10 +22,10 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationDefinition; import org.apache.brooklyn.api.management.ManagementContext; -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/d32d672a/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 6fb5816..2828846 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 @@ -26,6 +26,7 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.MachineLocation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; @@ -41,7 +42,7 @@ import com.google.common.net.HostAndPort; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.DoNothingSoftwareProcess; import brooklyn.entity.basic.Entities; -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; @@ -49,6 +50,7 @@ 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/d32d672a/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 fc942da..e7bb7db 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 @@ -22,6 +22,7 @@ import java.util.Iterator; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.Location; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -29,8 +30,9 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.Entities; -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/d32d672a/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 db185da..6c803e1 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 @@ -34,6 +34,7 @@ import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.camp.brooklyn.spi.dsl.methods.BrooklynDslCommon; import org.apache.brooklyn.camp.brooklyn.spi.dsl.methods.DslComponent; @@ -59,7 +60,6 @@ import brooklyn.entity.basic.SameServerEntity; import brooklyn.entity.effector.Effectors; import brooklyn.entity.group.DynamicCluster; import brooklyn.event.basic.Sensors; -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/d32d672a/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 0f8c839..524ea17 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 @@ -26,17 +26,17 @@ import java.io.StringReader; import java.util.List; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.MachineLocation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; - -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/d32d672a/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 82181d5..995a94d 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 @@ -21,11 +21,11 @@ package org.apache.brooklyn.camp.brooklyn; import java.util.Collection; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.Location; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractEntity; -import org.apache.brooklyn.location.Location; public class TestEntityWithInitConfigImpl extends AbstractEntity implements TestEntityWithInitConfig { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/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 19849b3..6b220fd 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 @@ -32,11 +32,11 @@ import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.catalog.CatalogItem.CatalogItemType; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynEntityMatcher; import brooklyn.catalog.internal.CatalogUtils; -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/d32d672a/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 8788d5b..7160657 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 @@ -29,14 +29,16 @@ import org.testng.annotations.Test; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.catalog.CatalogItem.CatalogBundle; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationDefinition; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; import brooklyn.catalog.CatalogPredicates; import brooklyn.event.basic.BasicConfigKey; -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/d32d672a/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 ba0a25b..32d2cec 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 @@ -38,13 +38,13 @@ import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.Template; import org.jclouds.compute.options.TemplateOptions; - -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationDefinition; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.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/d32d672a/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 61cc6de..bb12732 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 @@ -36,13 +36,13 @@ import org.apache.brooklyn.api.basic.BrooklynObject; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationResolver; import org.apache.brooklyn.cli.lister.ClassFinder; import org.apache.brooklyn.cli.lister.ItemDescriptors; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; -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/d32d672a/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 11a636d..9cef866 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 @@ -36,10 +36,10 @@ import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.EntityType; import org.apache.brooklyn.api.event.Sensor; +import org.apache.brooklyn.api.location.LocationResolver; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynConfigKeys; -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/d32d672a/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 123acd3..ff6a5d3 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,6 +44,7 @@ import java.util.regex.Pattern; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.cli.AbstractMain.BrooklynCommand; import org.apache.brooklyn.cli.AbstractMain.BrooklynCommandCollectingArgs; import org.apache.brooklyn.cli.AbstractMain.HelpCommand; @@ -65,8 +66,9 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.proxying.EntityProxy; import brooklyn.entity.trait.Startable; -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/d32d672a/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 f5a6b2c..a044735 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 @@ -37,6 +37,9 @@ import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; import org.apache.brooklyn.api.entity.rebind.RebindManager; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.HighAvailabilityManager; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; @@ -80,12 +83,9 @@ import brooklyn.entity.trait.Startable; import org.apache.brooklyn.launcher.config.StopWhichAppsOnShutdown; import org.apache.brooklyn.mementos.BrooklynMementoRawData; - -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/d32d672a/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 d63bb68..2b6c831 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 @@ -65,12 +65,12 @@ import brooklyn.config.BrooklynServiceAttributes; import brooklyn.config.ConfigKey; import brooklyn.internal.BrooklynInitialization; +import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.launcher.config.CustomResourceLocator; - -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/d32d672a/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 9489ad4..a8d301e 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 @@ -42,11 +42,11 @@ import brooklyn.event.basic.BasicConfigKey; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.launcher.SimpleYamlLauncherForTests; import org.apache.brooklyn.launcher.camp.SimpleYamlLauncher; -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/d32d672a/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 13931e4..bfbe81e 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 @@ -20,6 +20,7 @@ package org.apache.brooklyn.launcher; import org.apache.brooklyn.api.entity.Application; 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.launcher.BrooklynLauncher; @@ -45,7 +46,6 @@ import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.PersistenceObjectStore; -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/d32d672a/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 822a0ed..9f11563 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 @@ -20,6 +20,7 @@ package org.apache.brooklyn.launcher; import org.apache.brooklyn.api.entity.Application; 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.launcher.BrooklynLauncher; @@ -51,8 +52,9 @@ import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.rebind.RebindTestUtils; -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/d32d672a/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 2748179..59c5b0b 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 @@ -42,11 +42,11 @@ 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.launcher.BrooklynLauncher; - -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/d32d672a/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 e7dc4d4..d692790 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 @@ -42,11 +42,11 @@ 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.launcher.BrooklynLauncher; -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/d32d672a/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 ef9d8e6..c691efa 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,8 @@ import brooklyn.config.ConfigKey; import brooklyn.config.ConfigMap; import brooklyn.config.ConfigPredicates; import brooklyn.entity.basic.ConfigKeys; -import org.apache.brooklyn.location.PortRange; + +import org.apache.brooklyn.api.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/d32d672a/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 96b098f..9849ed2 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,6 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.Location; import brooklyn.management.entitlement.EntitlementPredicates; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.Entitlements.EntityAndItem; @@ -65,6 +64,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.rest.api.ApplicationApi; import org.apache.brooklyn.rest.domain.ApplicationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/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 31ee26c..b475ce3 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 @@ -40,14 +40,14 @@ import org.apache.brooklyn.api.catalog.CatalogItem.CatalogItemType; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; import brooklyn.catalog.CatalogPredicates; import brooklyn.catalog.internal.BasicBrooklynCatalog; import brooklyn.catalog.internal.CatalogDto; import brooklyn.catalog.internal.CatalogItemComparator; import brooklyn.catalog.internal.CatalogUtils; -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/d32d672a/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 bbe921c..ec730a9 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,6 @@ import org.slf4j.LoggerFactory; import brooklyn.entity.basic.BrooklynTags; import brooklyn.entity.basic.BrooklynTags.NamedStringTag; import brooklyn.entity.basic.BrooklynTaskTags; -import org.apache.brooklyn.location.Location; import brooklyn.management.entitlement.EntitlementPredicates; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.internal.EntityManagementUtils; @@ -49,6 +48,7 @@ import brooklyn.management.internal.EntityManagementUtils.CreationResult; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.rest.api.EntityApi; import org.apache.brooklyn.rest.domain.EntitySummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/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 9694747..83fa84d 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 @@ -30,12 +30,12 @@ import javax.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.catalog.CatalogItem; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationDefinition; import brooklyn.catalog.internal.CatalogUtils; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationDefinition; -import org.apache.brooklyn.location.basic.LocationConfigKeys; +import org.apache.brooklyn.location.basic.LocationConfigKeys; import org.apache.brooklyn.rest.api.LocationApi; import org.apache.brooklyn.rest.domain.LocationSpec; import org.apache.brooklyn.rest.domain.LocationSummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/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 18cb2ad..f56f67b 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,9 +37,9 @@ import javax.annotation.Nullable; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.trait.Startable; -import org.apache.brooklyn.location.Location; import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.ApplicationSummary; import org.apache.brooklyn.rest.domain.Status; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/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 53a0f85..9c7f64c 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 @@ -33,11 +33,11 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.EntityType; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.Sensor; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.EntityDynamicType; -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/d32d672a/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 1e2e8d4..72d17db 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,12 +25,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Sanitizer; -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.location.Location; +import org.apache.brooklyn.api.location.LocationDefinition; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.rest.domain.LocationSummary; import org.apache.brooklyn.rest.util.WebResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/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 f0de6d9..5218c99 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 @@ -45,6 +45,8 @@ import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; @@ -58,8 +60,6 @@ import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.trait.Startable; -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/d32d672a/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 20f5eb0..88eb899 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 @@ -22,9 +22,8 @@ import java.util.LinkedHashMap; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; - -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/d32d672a/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 f4fe4e9..52124b0 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 @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.brooklyn.api.basic.BrooklynObject; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.JsonGenerator; @@ -34,8 +35,6 @@ import org.codehaus.jackson.map.JsonSerializer; import org.codehaus.jackson.map.SerializerProvider; import org.codehaus.jackson.map.module.SimpleModule; -import org.apache.brooklyn.location.Location; - public class BidiSerialization { protected final static ThreadLocal<Boolean> STRICT_SERIALIZATION = new ThreadLocal<Boolean>(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/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 25351fe..d4c0089 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,12 +42,13 @@ import com.google.common.collect.Iterables; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.GenericType; -import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.api.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; + import brooklyn.test.Asserts; @Test(singleThreaded = true) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/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 dae1a6b..521c01e 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,8 +24,8 @@ import org.testng.Assert; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.rest.domain.ScriptExecutionSummary; import org.apache.brooklyn.rest.testing.mocks.RestMockApp; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/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 4e1fd22..42d1717 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,13 +38,16 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.SoftwareProcessEntityTest; -import org.apache.brooklyn.location.Location; -import org.apache.brooklyn.location.LocationSpec; -import org.apache.brooklyn.location.NoMachinesAvailableException; + +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.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; import org.apache.brooklyn.rest.domain.EntitySpec; import org.apache.brooklyn.rest.domain.Status; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d32d672a/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 8194547..9d1e9bd 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 @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.rest.testing; +import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; import org.codehaus.jackson.map.ObjectMapper; @@ -32,8 +33,9 @@ import com.sun.jersey.test.framework.JerseyTest; import com.sun.jersey.test.framework.LowLevelAppDescriptor; import brooklyn.entity.basic.Entities; -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/d32d672a/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 4647c13..c91568f 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,12 +31,12 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcess; -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.api.location.Location; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; import com.google.common.collect.ImmutableList;
