http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java index d58bf73..9a2791a 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; import com.google.common.collect.ImmutableList;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java index 8a0dd08..474133e 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java @@ -27,7 +27,7 @@ import org.apache.http.client.HttpClient; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy index 01a17e7..2b6c2c9 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy @@ -27,6 +27,7 @@ import org.apache.brooklyn.api.location.Location import org.apache.brooklyn.core.internal.BrooklynProperties import org.apache.brooklyn.core.test.entity.TestApplicationImpl import org.apache.brooklyn.entity.core.Entities +import org.apache.brooklyn.entity.software.base.SoftwareProcess import org.apache.brooklyn.entity.trait.Startable import org.apache.brooklyn.entity.webapp.jboss.JBoss6Server import org.apache.brooklyn.entity.webapp.jboss.JBoss6ServerImpl @@ -34,7 +35,7 @@ import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server import org.apache.brooklyn.entity.webapp.jboss.JBoss7ServerImpl import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer import org.apache.brooklyn.entity.webapp.tomcat.TomcatServerImpl -import org.apache.brooklyn.location.basic.BasicLocationRegistry +import org.apache.brooklyn.location.core.BasicLocationRegistry import org.apache.brooklyn.test.TestUtils import org.apache.brooklyn.util.internal.TimeExtras import org.slf4j.Logger @@ -44,8 +45,6 @@ import org.testng.annotations.BeforeMethod import org.testng.annotations.DataProvider import org.testng.annotations.Test -import brooklyn.entity.basic.SoftwareProcess - /** * This tests that we can run jboss entity on AWS. */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java index 5ce5f84..c8be35c 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java index 7ee8bcd..20a91b4 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java index f47a38b..1bb29e9 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java @@ -29,7 +29,7 @@ import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerNonInheritingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerNonInheritingIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerNonInheritingIntegrationTest.java index e01f3e0..2dd00c7 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerNonInheritingIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerNonInheritingIntegrationTest.java @@ -27,7 +27,7 @@ import java.net.URI; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport; import org.apache.brooklyn.entity.core.Entities; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerRebindingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerRebindingIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerRebindingIntegrationTest.java index 58dc04d..830c7b9 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerRebindingIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerRebindingIntegrationTest.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBossServersMultiVersionWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBossServersMultiVersionWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBossServersMultiVersionWebAppFixtureIntegrationTest.java index bda60b0..cd3ce60 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBossServersMultiVersionWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBossServersMultiVersionWebAppFixtureIntegrationTest.java @@ -25,7 +25,7 @@ import org.apache.brooklyn.entity.webapp.AbstractWebAppFixtureIntegrationTest; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.core.PortRanges; public class JBossServersMultiVersionWebAppFixtureIntegrationTest extends AbstractWebAppFixtureIntegrationTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jetty/JettyWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jetty/JettyWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jetty/JettyWebAppFixtureIntegrationTest.java index 38f8eda..b7a1fe5 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jetty/JettyWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jetty/JettyWebAppFixtureIntegrationTest.java @@ -25,7 +25,7 @@ import org.apache.brooklyn.entity.webapp.AbstractWebAppFixtureIntegrationTest; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.core.PortRanges; public class JettyWebAppFixtureIntegrationTest extends AbstractWebAppFixtureIntegrationTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 898472f..1e21c09 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 @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.webapp.nodejs; -import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.core.PortRanges; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 91e2ec8..1373b93 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 @@ -30,8 +30,8 @@ import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport; import org.jclouds.util.Throwables2; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.core.PortRanges; +import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.util.net.Networking; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 c6af8c0..f9d4ac1 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 @@ -33,7 +33,7 @@ import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.entity.software.base.SoftwareProcess; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 4d17684..76b3d71 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 @@ -27,7 +27,7 @@ import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 43b3143..84e975f 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 @@ -42,7 +42,7 @@ import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.core.PortRanges; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 431fec1..edb774f 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 @@ -43,12 +43,12 @@ import com.google.common.collect.Iterables; import com.google.common.net.HostAndPort; 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.byon.FixedListMachineProvisioningLocation; import org.apache.brooklyn.location.cloud.CloudLocationConfig; +import org.apache.brooklyn.location.core.LocationPredicates; +import org.apache.brooklyn.location.core.Machines; +import org.apache.brooklyn.location.ssh.SshMachineLocation; +import org.apache.brooklyn.location.winrm.WinRmMachineLocation; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.util.net.UserAndHostAndPort; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 19ac3a2..f7b6daa 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,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.collections.Jsonya; @Test http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 ef47d59..7c609b2 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 @@ -32,10 +32,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -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 org.apache.brooklyn.location.byon.FixedListMachineProvisioningLocation; +import org.apache.brooklyn.location.core.MultiLocation; +import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.text.Strings; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 9090075..2a82857 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 @@ -36,7 +36,7 @@ import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; import org.apache.brooklyn.core.catalog.CatalogPredicates; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.mgmt.osgi.OsgiStandaloneTest; -import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.util.text.StringFunctions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 bf3ca8d..a221afb 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 @@ -41,8 +41,8 @@ import org.jclouds.compute.options.TemplateOptions; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationDefinition; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; -import org.apache.brooklyn.location.basic.LocationConfigKeys; import org.apache.brooklyn.location.cloud.CloudLocationConfig; +import org.apache.brooklyn.location.core.LocationConfigKeys; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.location.jclouds.JcloudsUtil; import org.apache.brooklyn.util.exceptions.FatalConfigurationRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java index e5a40a7..7dfdcf8 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java @@ -65,8 +65,8 @@ import org.apache.brooklyn.cli.ItemLister.ListAllCommand; import org.apache.brooklyn.core.BrooklynVersion; import org.apache.brooklyn.core.catalog.internal.CatalogInitialization; import org.apache.brooklyn.core.mgmt.ha.OsgiManager; -import org.apache.brooklyn.core.mgmt.rebind.persister.BrooklynPersistenceUtils; -import org.apache.brooklyn.core.mgmt.rebind.persister.PersistMode; +import org.apache.brooklyn.core.mgmt.persist.BrooklynPersistenceUtils; +import org.apache.brooklyn.core.mgmt.persist.PersistMode; import org.apache.brooklyn.core.mgmt.rebind.transformer.CompoundTransformer; import org.apache.brooklyn.core.objs.BrooklynTypes; import org.apache.brooklyn.entity.core.AbstractApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 e64c95d..4528ebb 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 @@ -72,7 +72,7 @@ import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.SimulatedLocation; +import org.apache.brooklyn.location.core.SimulatedLocation; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 b5d2eec..5ea82f7 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 @@ -61,12 +61,12 @@ import org.apache.brooklyn.core.mgmt.ha.ManagementPlaneSyncRecordPersisterToObje import org.apache.brooklyn.core.mgmt.internal.BrooklynShutdownHooks; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; +import org.apache.brooklyn.core.mgmt.persist.BrooklynMementoPersisterToObjectStore; +import org.apache.brooklyn.core.mgmt.persist.BrooklynPersistenceUtils; +import org.apache.brooklyn.core.mgmt.persist.PersistMode; +import org.apache.brooklyn.core.mgmt.persist.PersistenceObjectStore; import org.apache.brooklyn.core.mgmt.rebind.PersistenceExceptionHandlerImpl; import org.apache.brooklyn.core.mgmt.rebind.RebindManagerImpl; -import org.apache.brooklyn.core.mgmt.rebind.persister.BrooklynMementoPersisterToObjectStore; -import org.apache.brooklyn.core.mgmt.rebind.persister.BrooklynPersistenceUtils; -import org.apache.brooklyn.core.mgmt.rebind.persister.PersistMode; -import org.apache.brooklyn.core.mgmt.rebind.persister.PersistenceObjectStore; import org.apache.brooklyn.core.mgmt.rebind.transformer.CompoundTransformer; import org.apache.brooklyn.core.server.BrooklynServerConfig; import org.apache.brooklyn.core.server.BrooklynServerPaths; @@ -89,8 +89,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.brooklyn.launcher.config.StopWhichAppsOnShutdown; -import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; -import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.core.PortRanges; +import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation.LocalhostMachine; import org.apache.brooklyn.rest.BrooklynWebConfig; import org.apache.brooklyn.rest.filter.BrooklynPropertiesSecurityFilter; import org.apache.brooklyn.rest.security.provider.BrooklynUserWithRandomPasswordSecurityProvider; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 21621de..f6623b2 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,8 +68,8 @@ import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; import org.apache.brooklyn.core.server.BrooklynServerPaths; import org.apache.brooklyn.core.server.BrooklynServiceAttributes; import org.apache.brooklyn.launcher.config.CustomResourceLocator; -import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.core.PortRanges; +import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.rest.BrooklynRestApi; import org.apache.brooklyn.rest.BrooklynWebConfig; import org.apache.brooklyn.rest.filter.BrooklynPropertiesSecurityFilter; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java index 0d074ca..6bc2b02 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java @@ -25,8 +25,8 @@ import org.apache.brooklyn.api.mgmt.ha.HighAvailabilityMode; import org.apache.brooklyn.api.mgmt.ha.ManagementPlaneSyncRecordPersister; import org.apache.brooklyn.core.internal.BrooklynProperties; import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; +import org.apache.brooklyn.core.mgmt.persist.PersistMode; import org.apache.brooklyn.core.mgmt.rebind.RebindTestUtils; -import org.apache.brooklyn.core.mgmt.rebind.persister.PersistMode; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.launcher.BrooklynLauncher; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java index 9904536..3f39a18 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java @@ -37,7 +37,7 @@ import com.google.common.io.Files; import org.apache.brooklyn.api.catalog.BrooklynCatalog; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.core.catalog.internal.CatalogInitialization; -import org.apache.brooklyn.core.mgmt.rebind.persister.PersistMode; +import org.apache.brooklyn.core.mgmt.persist.PersistMode; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.util.core.ResourceUtils; import org.apache.brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 d368842..0e34942 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 @@ -24,9 +24,9 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.api.mgmt.ha.HighAvailabilityMode; import org.apache.brooklyn.core.internal.BrooklynProperties; -import org.apache.brooklyn.core.mgmt.rebind.persister.BrooklynMementoPersisterToObjectStore; -import org.apache.brooklyn.core.mgmt.rebind.persister.PersistMode; -import org.apache.brooklyn.core.mgmt.rebind.persister.PersistenceObjectStore; +import org.apache.brooklyn.core.mgmt.persist.BrooklynMementoPersisterToObjectStore; +import org.apache.brooklyn.core.mgmt.persist.PersistMode; +import org.apache.brooklyn.core.mgmt.persist.PersistenceObjectStore; import org.apache.brooklyn.core.server.BrooklynServerConfig; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.core.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java index 1144932..9f072b2 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java @@ -22,9 +22,9 @@ import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.api.mgmt.ha.HighAvailabilityMode; import org.apache.brooklyn.core.internal.BrooklynProperties; -import org.apache.brooklyn.core.mgmt.rebind.persister.BrooklynMementoPersisterToObjectStore; -import org.apache.brooklyn.core.mgmt.rebind.persister.FileBasedObjectStore; -import org.apache.brooklyn.core.mgmt.rebind.persister.PersistMode; +import org.apache.brooklyn.core.mgmt.persist.BrooklynMementoPersisterToObjectStore; +import org.apache.brooklyn.core.mgmt.persist.FileBasedObjectStore; +import org.apache.brooklyn.core.mgmt.persist.PersistMode; import org.apache.brooklyn.core.server.BrooklynServerPaths; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.launcher.BrooklynLauncher; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java index b2be7c6..dba30ac 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java @@ -22,8 +22,10 @@ import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.api.mgmt.rebind.mementos.BrooklynMementoRawData; import org.apache.brooklyn.core.internal.BrooklynProperties; -import org.apache.brooklyn.core.mgmt.rebind.persister.BrooklynMementoPersisterToObjectStore; -import org.apache.brooklyn.core.mgmt.rebind.persister.PersistMode; +import org.apache.brooklyn.core.mgmt.persist.BrooklynMementoPersisterToObjectStore; +import org.apache.brooklyn.core.mgmt.persist.PersistMode; +import org.apache.brooklyn.core.mgmt.persist.jclouds.BlobStoreTest; +import org.apache.brooklyn.core.mgmt.persist.jclouds.JcloudsBlobStoreBasedObjectStore; import org.apache.brooklyn.core.server.BrooklynServerPaths; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.core.test.entity.TestApplication; @@ -37,9 +39,6 @@ import static org.testng.Assert.assertEquals; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.rebind.persister.jclouds.BlobStoreTest; -import brooklyn.entity.rebind.persister.jclouds.JcloudsBlobStoreBasedObjectStore; - @Test(groups="Live") public class BrooklynLauncherRebindToCloudObjectStoreTest extends BrooklynLauncherRebindTestFixture { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 c4f25f1..e25e1fd 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 @@ -59,7 +59,7 @@ import org.apache.brooklyn.util.text.Strings; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import com.google.api.client.util.Preconditions; import com.google.common.base.Charsets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java index 6e228bf..b757652 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java @@ -30,9 +30,9 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherAbstract; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; +import org.apache.brooklyn.core.mgmt.persist.FileBasedObjectStore; import org.apache.brooklyn.core.mgmt.rebind.RebindOptions; import org.apache.brooklyn.core.mgmt.rebind.RebindTestUtils; -import org.apache.brooklyn.core.mgmt.rebind.persister.FileBasedObjectStore; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.lifecycle.Lifecycle; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 c500473..775d39b 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 @@ -27,7 +27,7 @@ import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.webapp.jboss.JBoss7ServerImpl; import org.apache.brooklyn.entity.webapp.jboss.JBoss7SshDriver; import org.apache.brooklyn.location.access.BrooklynAccessUtils; -import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.sensor.feed.function.FunctionFeed; import org.apache.brooklyn.sensor.feed.function.FunctionPollConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 af7d7db..4638aea 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 @@ -27,7 +27,7 @@ import org.apache.brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.entity.database.mysql.MySqlNodeImpl; import org.apache.brooklyn.entity.database.mysql.MySqlSshDriver; import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; -import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.feed.function.FunctionFeed; import org.apache.brooklyn.sensor.feed.function.FunctionPollConfig; import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 0de4bbc..258da82 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 @@ -32,7 +32,7 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.entity.proxy.nginx.NginxControllerImpl; import org.apache.brooklyn.entity.proxy.nginx.NginxSshDriver; import org.apache.brooklyn.entity.proxy.nginx.UrlMapping; -import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.feed.ConfigToAttributes; import org.apache.brooklyn.sensor.feed.function.FunctionFeed; import org.apache.brooklyn.sensor.feed.function.FunctionPollConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 7423322..fe5b499 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 @@ -43,7 +43,7 @@ import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.launcher.BrooklynLauncher; -import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; import org.apache.brooklyn.policy.enricher.HttpLatencyDetector; import org.apache.brooklyn.sensor.enricher.Enrichers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 80fd5a5..e8489aa 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 @@ -33,7 +33,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.api.mgmt.ha.HighAvailabilityMode; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; -import org.apache.brooklyn.core.mgmt.rebind.persister.PersistMode; +import org.apache.brooklyn.core.mgmt.persist.PersistMode; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.StartableApplication; import org.apache.brooklyn.entity.trait.Startable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 04ab24c..c2b40c2 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 @@ -33,7 +33,7 @@ import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.BasicLocationRegistry; +import org.apache.brooklyn.location.core.BasicLocationRegistry; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 808b5d3..6eb4f6c 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 @@ -31,7 +31,7 @@ import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.BasicLocationRegistry; +import org.apache.brooklyn.location.core.BasicLocationRegistry; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 1a9783e..7d4275a 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 @@ -33,7 +33,7 @@ import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationDefinition; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; -import org.apache.brooklyn.location.basic.LocationConfigKeys; +import org.apache.brooklyn.location.core.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/a1ad34d7/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java index 3caad68..1cca2c7 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java @@ -55,9 +55,9 @@ import org.apache.brooklyn.core.BrooklynVersion; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.mgmt.entitlement.Entitlements; import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; -import org.apache.brooklyn.core.mgmt.rebind.persister.BrooklynPersistenceUtils; -import org.apache.brooklyn.core.mgmt.rebind.persister.FileBasedObjectStore; -import org.apache.brooklyn.core.mgmt.rebind.persister.PersistenceObjectStore; +import org.apache.brooklyn.core.mgmt.persist.BrooklynPersistenceUtils; +import org.apache.brooklyn.core.mgmt.persist.FileBasedObjectStore; +import org.apache.brooklyn.core.mgmt.persist.PersistenceObjectStore; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.StartableApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 44a5b34..16c6c65 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 @@ -23,9 +23,9 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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.location.core.BasicLocationDefinition; +import org.apache.brooklyn.location.core.LocationConfigKeys; +import org.apache.brooklyn.location.core.internal.LocationInternal; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationDefinition; import org.apache.brooklyn.api.mgmt.ManagementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 fb11271..a0cf857 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,7 +24,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.mgmt.ManagementContext; -import org.apache.brooklyn.location.basic.LocationConfigKeys; +import org.apache.brooklyn.location.core.LocationConfigKeys; public class EntityLocationUtils { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 d8a3052..a65dc15 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 @@ -56,9 +56,9 @@ import com.sun.jersey.api.client.UniformInterfaceException; import com.sun.jersey.api.client.WebResource; import com.sun.jersey.core.util.MultivaluedMapImpl; -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.core.AbstractLocation; +import org.apache.brooklyn.location.core.LocationConfigKeys; +import org.apache.brooklyn.location.core.internal.LocationInternal; import org.apache.brooklyn.location.geo.HostGeoInfo; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.internal.EntityLocal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 5d5f697..cb006fd 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 @@ -43,7 +43,7 @@ import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.GenericType; import org.apache.brooklyn.api.location.LocationSpec; -import org.apache.brooklyn.location.basic.SimulatedLocation; +import org.apache.brooklyn.location.core.SimulatedLocation; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.rest.domain.CatalogLocationSummary; import org.apache.brooklyn.rest.domain.LocationSummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 6250992..54ef87d 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 @@ -43,8 +43,8 @@ import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.entity.factory.ApplicationBuilder; import org.apache.brooklyn.entity.software.base.SoftwareProcessEntityTest; -import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.ssh.SshMachineLocation; 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/a1ad34d7/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 15c8bb3..e0318c4 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 @@ -36,7 +36,7 @@ import com.sun.jersey.test.framework.AppDescriptor; import com.sun.jersey.test.framework.JerseyTest; import com.sun.jersey.test.framework.LowLevelAppDescriptor; -import org.apache.brooklyn.location.basic.BasicLocationRegistry; +import org.apache.brooklyn.location.core.BasicLocationRegistry; import org.apache.brooklyn.rest.BrooklynRestApi; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTest; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 d5e608f..5ecf58d 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 @@ -32,7 +32,7 @@ import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.core.BasicAttributeSensor; import org.apache.brooklyn.util.core.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/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 ace877b..d6cae27 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 @@ -27,8 +27,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.basic.AbstractLocation; -import org.apache.brooklyn.location.basic.LocationInternal; +import org.apache.brooklyn.location.core.AbstractLocation; +import org.apache.brooklyn.location.core.internal.LocationInternal; import org.apache.brooklyn.location.geo.HostGeoInfo; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java index 48576c4..a474a03 100644 --- a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java +++ b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.test.osgi.entities; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.location.basic.AbstractLocation; +import org.apache.brooklyn.location.core.AbstractLocation; import org.apache.brooklyn.util.core.flags.SetFromFlag; public class SimpleLocation extends AbstractLocation { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1ad34d7/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java index 8af0a34..14c884d 100644 --- a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java +++ b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.test.osgi.entities.more; -import org.apache.brooklyn.location.basic.AbstractLocation; +import org.apache.brooklyn.location.core.AbstractLocation; public class MoreLocation extends AbstractLocation { }
