http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java b/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java index 5fe62ea..86cb6a7 100644 --- a/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java +++ b/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java @@ -35,7 +35,7 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.effector.EffectorTasks; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.net.Urls; import brooklyn.util.task.BasicExecutionManager; import brooklyn.util.task.DynamicTasks;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java b/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java index 9492fc3..2e68f6f 100644 --- a/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java +++ b/software/base/src/main/java/brooklyn/entity/software/MachineInitTasks.java @@ -32,7 +32,7 @@ import com.google.common.collect.Lists; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.EntityInternal; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.net.Protocol; import brooklyn.util.ssh.BashCommands; import brooklyn.util.ssh.IptablesCommands; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java index 4036f16..8c68442 100644 --- a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java @@ -31,6 +31,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.location.MachineManagementMixins; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,17 +63,17 @@ import brooklyn.entity.effector.Effectors; import brooklyn.entity.trait.Startable; import brooklyn.entity.trait.StartableMethods; import brooklyn.event.feed.ConfigToAttributes; -import brooklyn.location.Location; -import brooklyn.location.MachineLocation; -import brooklyn.location.MachineManagementMixins.SuspendsMachines; -import brooklyn.location.MachineProvisioningLocation; -import brooklyn.location.NoMachinesAvailableException; -import brooklyn.location.basic.AbstractLocation; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.Locations; -import brooklyn.location.basic.Machines; -import brooklyn.location.basic.SshMachineLocation; -import brooklyn.location.cloud.CloudLocationConfig; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.MachineLocation; +import org.apache.brooklyn.location.MachineManagementMixins.SuspendsMachines; +import org.apache.brooklyn.location.MachineProvisioningLocation; +import org.apache.brooklyn.location.NoMachinesAvailableException; +import org.apache.brooklyn.location.basic.AbstractLocation; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.Locations; +import org.apache.brooklyn.location.basic.Machines; +import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.cloud.CloudLocationConfig; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; @@ -898,7 +899,7 @@ public abstract class MachineLifecycleEffectorTasks { * {@link SuspendsMachines suspending machines}. * * @throws java.lang.UnsupportedOperationException if the entity's provisioner cannot suspend machines. - * @see brooklyn.location.MachineManagementMixins.SuspendsMachines + * @see MachineManagementMixins.SuspendsMachines */ protected StopMachineDetails<Integer> suspendAnyProvisionedMachines() { @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/main/java/brooklyn/entity/software/ProvidesProvisioningFlags.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/ProvidesProvisioningFlags.java b/software/base/src/main/java/brooklyn/entity/software/ProvidesProvisioningFlags.java index 6b78ccd..28888e9 100644 --- a/software/base/src/main/java/brooklyn/entity/software/ProvidesProvisioningFlags.java +++ b/software/base/src/main/java/brooklyn/entity/software/ProvidesProvisioningFlags.java @@ -18,7 +18,7 @@ */ package brooklyn.entity.software; -import brooklyn.location.MachineProvisioningLocation; +import org.apache.brooklyn.location.MachineProvisioningLocation; import brooklyn.util.config.ConfigBag; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java index 9530a6c..c3590b4 100644 --- a/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java @@ -39,9 +39,9 @@ import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.EffectorTasks; import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory; -import brooklyn.location.Location; -import brooklyn.location.basic.LocationInternal; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.basic.LocationInternal; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.config.ConfigBag; import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.ssh.BashCommands; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/main/resources/META-INF/services/brooklyn.location.LocationResolver ---------------------------------------------------------------------- diff --git a/software/base/src/main/resources/META-INF/services/brooklyn.location.LocationResolver b/software/base/src/main/resources/META-INF/services/brooklyn.location.LocationResolver deleted file mode 100644 index 2a041b4..0000000 --- a/software/base/src/main/resources/META-INF/services/brooklyn.location.LocationResolver +++ /dev/null @@ -1 +0,0 @@ -brooklyn.entity.pool.ServerPoolLocationResolver http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.location.LocationResolver ---------------------------------------------------------------------- diff --git a/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.location.LocationResolver b/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.location.LocationResolver new file mode 100644 index 0000000..2a041b4 --- /dev/null +++ b/software/base/src/main/resources/META-INF/services/org.apache.brooklyn.location.LocationResolver @@ -0,0 +1 @@ +brooklyn.entity.pool.ServerPoolLocationResolver http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java index 85de4ab..40a906c 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java @@ -25,9 +25,9 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; -import brooklyn.location.Location; -import brooklyn.location.jclouds.JcloudsLocation; -import brooklyn.location.jclouds.JcloudsLocationConfig; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.jclouds.JcloudsLocation; +import org.apache.brooklyn.location.jclouds.JcloudsLocationConfig; import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java index 766822b..72bf949 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java @@ -30,7 +30,7 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java index 5ff72d9..3afd6c3 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java @@ -34,7 +34,7 @@ import com.google.common.collect.ImmutableMap; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; import brooklyn.util.text.StringShortener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/basic/AbstractSoftwareProcessRestartIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/AbstractSoftwareProcessRestartIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/basic/AbstractSoftwareProcessRestartIntegrationTest.java index b1860ac..257cacf 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/AbstractSoftwareProcessRestartIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/AbstractSoftwareProcessRestartIntegrationTest.java @@ -30,7 +30,7 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppLiveTestSupport; import brooklyn.entity.basic.SoftwareProcess.RestartSoftwareParameters; import brooklyn.entity.basic.SoftwareProcess.StopSoftwareParameters; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.util.collections.CollectionFunctionals; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/basic/DoNothingSoftwareProcessDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/DoNothingSoftwareProcessDriver.java b/software/base/src/test/java/brooklyn/entity/basic/DoNothingSoftwareProcessDriver.java index b742b44..792b46d 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/DoNothingSoftwareProcessDriver.java +++ b/software/base/src/test/java/brooklyn/entity/basic/DoNothingSoftwareProcessDriver.java @@ -20,7 +20,7 @@ package brooklyn.entity.basic; import org.apache.brooklyn.api.entity.basic.EntityLocal; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; /** * Implements methods in {@link brooklyn.entity.basic.AbstractSoftwareProcessSshDriver} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java b/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java index 2ad2add..602eefe 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SameServerEntityTest.java @@ -31,9 +31,9 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.location.Location; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java index c408604..21ba4e8 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java @@ -38,9 +38,9 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.SoftwareProcessEntityTest.MyService; import brooklyn.entity.basic.SoftwareProcessEntityTest.SimulatedDriver; import brooklyn.event.basic.DependentConfiguration; -import brooklyn.location.LocationSpec; -import brooklyn.location.basic.FixedListMachineProvisioningLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.test.Asserts; import brooklyn.util.task.TaskInternal; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java index 81ad9da..fd70e7e 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java @@ -41,11 +41,11 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.ServiceStateLogic.ServiceProblemsLogic; import brooklyn.entity.basic.SoftwareProcessEntityTest.MyService; import brooklyn.entity.rebind.RebindTestUtils; -import brooklyn.location.LocationSpec; -import brooklyn.location.MachineProvisioningLocation; -import brooklyn.location.NoMachinesAvailableException; -import brooklyn.location.basic.AbstractLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.MachineProvisioningLocation; +import org.apache.brooklyn.location.NoMachinesAvailableException; +import org.apache.brooklyn.location.basic.AbstractLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.flags.SetFromFlag; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java index bdbccd2..b66e3dd 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java @@ -63,13 +63,13 @@ import brooklyn.entity.effector.Effectors; import brooklyn.entity.software.MachineLifecycleEffectorTasksTest; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.location.Location; -import brooklyn.location.LocationSpec; -import brooklyn.location.MachineLocation; -import brooklyn.location.basic.FixedListMachineProvisioningLocation; -import brooklyn.location.basic.Locations; -import brooklyn.location.basic.SimulatedLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.MachineLocation; +import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.Locations; +import org.apache.brooklyn.location.basic.SimulatedLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java index 7642ce2..65d9037 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java @@ -25,7 +25,6 @@ import static org.testng.Assert.assertTrue; import java.io.File; import java.io.IOException; import java.io.StringReader; -import java.net.InetAddress; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -40,13 +39,12 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.trait.Startable; -import brooklyn.location.LocationSpec; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.BrooklynNetworkUtils; import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; import brooklyn.util.os.Os; import brooklyn.util.stream.KnownSizeInputStream; import brooklyn.util.stream.Streams; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSubclassTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSubclassTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSubclassTest.java index 5e60ba5..388d78d 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSubclassTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSubclassTest.java @@ -32,7 +32,7 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.effector.EffectorAndBody; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java index de9a247..0bd1b09 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java @@ -32,7 +32,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.SoftwareProcess.ChildStartableMode; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.util.ResourceUtils; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/basic/lifecycle/MyEntityImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/MyEntityImpl.java b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/MyEntityImpl.java index aa57e19..c8eca43 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/MyEntityImpl.java +++ b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/MyEntityImpl.java @@ -26,7 +26,7 @@ import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.basic.SoftwareProcessDriver; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java index df89383..52929a9 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java @@ -33,8 +33,8 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.BrooklynTaskTags.WrappedStream; -import brooklyn.location.NoMachinesAvailableException; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.NoMachinesAvailableException; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.repeat.Repeater; import brooklyn.util.task.BasicExecutionContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java index 3cb8e6a..c5efb0e 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java @@ -40,9 +40,9 @@ import brooklyn.entity.basic.SoftwareProcessEntityTest.MyServiceImpl; import brooklyn.entity.trait.Startable; import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.function.FunctionPollConfig; -import brooklyn.location.LocationSpec; -import brooklyn.location.basic.FixedListMachineProvisioningLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.time.Duration; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java index 70f5341..1ef3e94 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java @@ -41,7 +41,7 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynClusterIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynClusterIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynClusterIntegrationTest.java index ea9bfff..a961208 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynClusterIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynClusterIntegrationTest.java @@ -32,7 +32,7 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.brooklynnode.BrooklynNode.ExistingFileBehaviour; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.net.Networking; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java index eb84f68..a088996 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java @@ -58,17 +58,15 @@ import brooklyn.entity.brooklynnode.BrooklynNode.ExistingFileBehaviour; import brooklyn.entity.brooklynnode.BrooklynNode.StopNodeAndKillAppsEffector; import brooklyn.entity.proxying.EntityProxyImpl; import brooklyn.event.feed.http.JsonFunctions; -import brooklyn.location.MachineLocation; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.Locations; -import brooklyn.location.basic.PortRanges; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.Locations; +import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Functionals; -import brooklyn.util.guava.Maybe; import brooklyn.util.http.HttpTool; import brooklyn.util.http.HttpToolResponse; import brooklyn.util.javalang.JavaClassNames; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java index cf6cfd8..d07cc89 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java @@ -37,8 +37,8 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.trait.Startable; import brooklyn.event.feed.ConfigToAttributes; -import brooklyn.location.Location; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java index e903351..4268998 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java @@ -29,7 +29,7 @@ import brooklyn.entity.brooklynnode.CallbackEntityHttpClient.Request; import brooklyn.entity.brooklynnode.effector.SetHighAvailabilityModeEffectorBody; import brooklyn.entity.brooklynnode.effector.SetHighAvailabilityPriorityEffectorBody; import brooklyn.event.basic.BasicAttributeSensor; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import com.google.common.base.Function; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/brooklynnode/SameBrooklynNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/SameBrooklynNodeImpl.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/SameBrooklynNodeImpl.java index 4366873..8aae8a2 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/SameBrooklynNodeImpl.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/SameBrooklynNodeImpl.java @@ -26,7 +26,7 @@ import brooklyn.entity.brooklynnode.BrooklynNodeImpl.DeployBlueprintEffectorBody import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.event.feed.http.HttpValueFunctions; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; /** Implementation of BrooklynNode which just presents the node where this is running, for convenience; * http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java b/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java index 4150ec9..50176e0 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java +++ b/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java @@ -29,15 +29,14 @@ import org.testng.annotations.BeforeMethod; import brooklyn.entity.BrooklynAppLiveTestSupport; import brooklyn.entity.basic.EntityInternal; -import brooklyn.location.Location; -import brooklyn.location.MachineProvisioningLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.MachineProvisioningLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.ResourceUtils; import brooklyn.util.io.FileUtil; import brooklyn.util.stream.InputStreamSupplier; import com.google.common.base.Throwables; -import com.google.common.io.ByteSource; import com.google.common.io.Files; public class ChefLiveTestSupport extends BrooklynAppLiveTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/chef/mysql/AbstractChefToyMySqlEntityLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/mysql/AbstractChefToyMySqlEntityLiveTest.java b/software/base/src/test/java/brooklyn/entity/chef/mysql/AbstractChefToyMySqlEntityLiveTest.java index 9527d0b..23a6255 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/mysql/AbstractChefToyMySqlEntityLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/chef/mysql/AbstractChefToyMySqlEntityLiveTest.java @@ -22,8 +22,8 @@ import org.testng.annotations.Test; import brooklyn.entity.chef.ChefLiveTestSupport; import brooklyn.entity.software.mysql.AbstractToyMySqlEntityTest; -import brooklyn.location.MachineProvisioningLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.MachineProvisioningLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; public abstract class AbstractChefToyMySqlEntityLiveTest extends AbstractToyMySqlEntityTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/driver/MockSshDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/driver/MockSshDriver.java b/software/base/src/test/java/brooklyn/entity/driver/MockSshDriver.java index fdfca3f..42d7429 100644 --- a/software/base/src/test/java/brooklyn/entity/driver/MockSshDriver.java +++ b/software/base/src/test/java/brooklyn/entity/driver/MockSshDriver.java @@ -21,8 +21,8 @@ package brooklyn.entity.driver; import org.apache.brooklyn.api.entity.basic.EntityLocal; import brooklyn.entity.basic.SoftwareProcessDriver; -import brooklyn.location.Location; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.basic.SshMachineLocation; public class MockSshDriver implements SoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java b/software/base/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java index d0ccb2c..c9e85f4 100644 --- a/software/base/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java +++ b/software/base/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java @@ -33,12 +33,12 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.location.Location; -import brooklyn.location.LocationSpec; -import brooklyn.location.MachineLocation; -import brooklyn.location.MachineProvisioningLocation; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.MultiLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.MachineLocation; +import org.apache.brooklyn.location.MachineProvisioningLocation; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.MultiLocation; import brooklyn.test.Asserts; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java b/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java index 475f788..8505ba7 100644 --- a/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java @@ -36,8 +36,8 @@ import brooklyn.entity.java.UsesJmx.JmxAgentModes; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.feed.jmx.JmxAttributePollConfig; import brooklyn.event.feed.jmx.JmxFeed; -import brooklyn.location.MachineLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.MachineLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.test.JmxService; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java b/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java index 3f44b6f..1896ed5 100644 --- a/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java @@ -36,9 +36,9 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.location.LocationSpec; -import brooklyn.location.MachineLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.MachineLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java index bf824c9..ec825ec 100644 --- a/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java @@ -35,9 +35,9 @@ import brooklyn.entity.BrooklynAppLiveTestSupport; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.basic.lifecycle.MyEntity; -import brooklyn.location.LocationSpec; -import brooklyn.location.MachineProvisioningLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.MachineProvisioningLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java index d139001..41ec5c5 100644 --- a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java @@ -38,7 +38,7 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JavaOptsTest.TestingJavaOptsVanillaJavaAppImpl; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.event.basic.Sensors; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java index d9d486e..73a2675 100644 --- a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java @@ -53,8 +53,8 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; import brooklyn.event.feed.jmx.JmxHelper; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.PortRanges; import brooklyn.test.Asserts; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/machine/MachineEntityEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/machine/MachineEntityEc2LiveTest.java b/software/base/src/test/java/brooklyn/entity/machine/MachineEntityEc2LiveTest.java index f902ecd..344f8f3 100644 --- a/software/base/src/test/java/brooklyn/entity/machine/MachineEntityEc2LiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/machine/MachineEntityEc2LiveTest.java @@ -27,7 +27,7 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; import brooklyn.entity.AbstractEc2LiveTest; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.test.Asserts; public class MachineEntityEc2LiveTest extends AbstractEc2LiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java b/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java index 268a7db..0996b88 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java @@ -35,10 +35,10 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.Entities; -import brooklyn.location.Location; -import brooklyn.location.LocationSpec; -import brooklyn.location.NoMachinesAvailableException; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.NoMachinesAvailableException; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.util.exceptions.Exceptions; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java index 099a2f2..6a7e297 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java @@ -33,7 +33,7 @@ import com.google.common.collect.ImmutableList; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Attributes; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.util.collections.MutableMap; public class ServerPoolLiveTest extends AbstractServerPoolTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java index daac862..6b6c045 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java @@ -37,10 +37,10 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.Entities; -import brooklyn.location.Location; -import brooklyn.location.LocationSpec; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.dynamic.DynamicLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.dynamic.DynamicLocation; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java index 9876dc4..ef7c8c4 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java @@ -34,8 +34,8 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Lifecycle; -import brooklyn.location.LocationSpec; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/service/SystemServiceEnricherTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/service/SystemServiceEnricherTest.java b/software/base/src/test/java/brooklyn/entity/service/SystemServiceEnricherTest.java index 8611536..9367e40 100644 --- a/software/base/src/test/java/brooklyn/entity/service/SystemServiceEnricherTest.java +++ b/software/base/src/test/java/brooklyn/entity/service/SystemServiceEnricherTest.java @@ -34,8 +34,8 @@ import brooklyn.entity.basic.VanillaSoftwareProcess; import brooklyn.entity.basic.VanillaSoftwareProcessImpl; import brooklyn.entity.basic.VanillaSoftwareProcessSshDriver; import brooklyn.entity.effector.EffectorTasks; -import brooklyn.location.basic.SshMachineLocation; -import brooklyn.location.jclouds.JcloudsLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.jclouds.JcloudsLocation; import brooklyn.test.Asserts; import brooklyn.util.ssh.BashCommands; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java index facc56b..e64ccdb 100644 --- a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java @@ -21,7 +21,7 @@ package brooklyn.entity.software; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java b/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java index 7e542ea..2fcd1df 100644 --- a/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java @@ -50,7 +50,7 @@ import brooklyn.entity.basic.SoftwareProcess.StopSoftwareParameters.StopMode; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.DependentConfiguration; import brooklyn.event.basic.Sensors; -import brooklyn.location.jclouds.BailOutJcloudsLocation; +import org.apache.brooklyn.location.jclouds.BailOutJcloudsLocation; import brooklyn.test.Asserts; import brooklyn.util.task.TaskInternal; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java b/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java index 0529262..ae5f436 100644 --- a/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java @@ -34,9 +34,9 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.effector.Effectors; import brooklyn.entity.software.SshEffectorTasks.SshEffectorBody; -import brooklyn.location.LocationSpec; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.config.ConfigBag; import brooklyn.util.task.system.ProcessTaskWrapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java b/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java index c726b44..dcea2bb 100644 --- a/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java @@ -34,11 +34,10 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.location.LocationSpec; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.exceptions.PropagatedRuntimeException; import brooklyn.util.net.Urls; import brooklyn.util.task.ssh.SshFetchTaskWrapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java b/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java index c8d0680..81a2a5b 100644 --- a/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java @@ -31,7 +31,7 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.event.basic.Sensors; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.test.TestHttpRequestHandler; import brooklyn.test.TestHttpServer; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java b/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java index c5dc34c..6521467 100644 --- a/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java @@ -30,10 +30,10 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.software.SshEffectorTasks; -import brooklyn.location.LocationSpec; -import brooklyn.location.MachineProvisioningLocation; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.MachineProvisioningLocation; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.task.system.ProcessTaskWrapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java b/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java index f894ca1..b7144dd 100644 --- a/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java +++ b/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java @@ -32,11 +32,11 @@ import brooklyn.entity.basic.BasicStartable; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.software.MachineLifecycleEffectorTasks; import brooklyn.entity.software.SshEffectorTasks; -import brooklyn.location.MachineLocation; -import brooklyn.location.OsDetails; -import brooklyn.location.basic.BasicOsDetails.OsVersions; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.MachineLocation; +import org.apache.brooklyn.location.OsDetails; +import org.apache.brooklyn.location.basic.BasicOsDetails.OsVersions; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.ssh.BashCommands; import brooklyn.util.task.DynamicTasks; import brooklyn.util.task.Tasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityTest.java b/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityTest.java index 7077c6e..2299831 100644 --- a/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityTest.java @@ -25,7 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java index 40d77d1..c69fb37 100644 --- a/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java @@ -38,8 +38,8 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.effector.Effectors; import brooklyn.event.basic.Sensors; -import brooklyn.location.Location; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/event/basic/PortAttributeSensorAndConfigKeyTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/event/basic/PortAttributeSensorAndConfigKeyTest.java b/software/base/src/test/java/brooklyn/event/basic/PortAttributeSensorAndConfigKeyTest.java index 2e543f1..2db5108 100644 --- a/software/base/src/test/java/brooklyn/event/basic/PortAttributeSensorAndConfigKeyTest.java +++ b/software/base/src/test/java/brooklyn/event/basic/PortAttributeSensorAndConfigKeyTest.java @@ -28,9 +28,9 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.EmptySoftwareProcessImpl; import brooklyn.entity.basic.Entities; -import brooklyn.location.Location; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java b/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java index 0a3322c..ba1050d 100644 --- a/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java +++ b/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java @@ -59,7 +59,6 @@ import org.testng.annotations.Test; import org.testng.collections.Lists; import brooklyn.entity.basic.AbstractEntity; -import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JmxSupport; @@ -69,9 +68,9 @@ import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.event.basic.Sensors; import brooklyn.event.feed.ConfigToAttributes; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.PortRanges; -import brooklyn.location.basic.SimulatedLocation; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; import brooklyn.test.GeneralisedDynamicMBean; import brooklyn.test.JmxService; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java b/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java index db8c15c..6e444c1 100644 --- a/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java +++ b/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java @@ -42,9 +42,9 @@ import brooklyn.entity.java.UsesJmx.JmxAgentModes; import brooklyn.entity.rebind.RebindTestFixtureWithApp; import brooklyn.event.basic.Sensors; import brooklyn.event.feed.ConfigToAttributes; -import brooklyn.location.Location; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.PortRanges; import brooklyn.test.GeneralisedDynamicMBean; import brooklyn.test.JmxService; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/location/basic/MachineDetailsEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/location/basic/MachineDetailsEc2LiveTest.java b/software/base/src/test/java/brooklyn/location/basic/MachineDetailsEc2LiveTest.java deleted file mode 100644 index 101cb7c..0000000 --- a/software/base/src/test/java/brooklyn/location/basic/MachineDetailsEc2LiveTest.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package brooklyn.location.basic; - -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; - -import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.test.EntityTestUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.collect.ImmutableList; - -import brooklyn.entity.AbstractEc2LiveTest; -import brooklyn.entity.basic.EmptySoftwareProcess; -import brooklyn.entity.trait.Startable; -import brooklyn.location.Location; -import brooklyn.location.MachineDetails; -import brooklyn.location.OsDetails; -import brooklyn.util.collections.MutableMap; - -// This test really belongs in brooklyn-location but depends on AbstractEc2LiveTest in brooklyn-software-base -public class MachineDetailsEc2LiveTest extends AbstractEc2LiveTest { - - private static final Logger LOG = LoggerFactory.getLogger(MachineDetailsEc2LiveTest.class); - private static final int TIMEOUT_MS = 1000 * 60 * 10; // ten minutes - - @Override - protected void doTest(Location loc) throws Exception { - Entity testEntity = app.createAndManageChild(EntitySpec.create(EmptySoftwareProcess.class)); - app.start(ImmutableList.of(loc)); - EntityTestUtils.assertAttributeEqualsEventually(MutableMap.of("timeout", TIMEOUT_MS), - testEntity, Startable.SERVICE_UP, true); - - SshMachineLocation sshLoc = Locations.findUniqueSshMachineLocation(testEntity.getLocations()).get(); - MachineDetails machine = app.getExecutionContext() - .submit(BasicMachineDetails.taskForSshMachineLocation(sshLoc)) - .getUnchecked(); - LOG.info("Found the following at {}: {}", loc, machine); - assertNotNull(machine); - OsDetails details = machine.getOsDetails(); - assertNotNull(details); - assertNotNull(details.getArch()); - assertNotNull(details.getName()); - assertNotNull(details.getVersion()); - assertFalse(details.getArch().startsWith("architecture:")); - assertFalse(details.getName().startsWith("name:")); - assertFalse(details.getVersion().startsWith("version:")); - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/location/basic/MachineDetailsGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/location/basic/MachineDetailsGoogleComputeLiveTest.java b/software/base/src/test/java/brooklyn/location/basic/MachineDetailsGoogleComputeLiveTest.java deleted file mode 100644 index 7cc77ef..0000000 --- a/software/base/src/test/java/brooklyn/location/basic/MachineDetailsGoogleComputeLiveTest.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package brooklyn.location.basic; - -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; - -import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.test.EntityTestUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.collect.ImmutableList; - -import brooklyn.entity.AbstractGoogleComputeLiveTest; -import brooklyn.entity.basic.EmptySoftwareProcess; -import brooklyn.entity.trait.Startable; -import brooklyn.location.Location; -import brooklyn.location.MachineDetails; -import brooklyn.location.OsDetails; -import brooklyn.util.collections.MutableMap; - -// This test really belongs in brooklyn-location but depends on AbstractGoogleComputeLiveTest in brooklyn-software-base -public class MachineDetailsGoogleComputeLiveTest extends AbstractGoogleComputeLiveTest { - - private static final Logger LOG = LoggerFactory.getLogger(MachineDetailsGoogleComputeLiveTest.class); - - @Override - protected void doTest(Location loc) throws Exception { - Entity testEntity = app.createAndManageChild(EntitySpec.create(EmptySoftwareProcess.class)); - app.start(ImmutableList.of(loc)); - EntityTestUtils.assertAttributeEqualsEventually(testEntity, Startable.SERVICE_UP, true); - - SshMachineLocation sshLoc = Locations.findUniqueSshMachineLocation(testEntity.getLocations()).get(); - MachineDetails machine = app.getExecutionContext() - .submit(BasicMachineDetails.taskForSshMachineLocation(sshLoc)) - .getUnchecked(); - LOG.info("Found the following at {}: {}", loc, machine); - assertNotNull(machine); - OsDetails details = machine.getOsDetails(); - assertNotNull(details); - assertNotNull(details.getArch()); - assertNotNull(details.getName()); - assertNotNull(details.getVersion()); - assertFalse(details.getArch().startsWith("architecture:")); - assertFalse(details.getName().startsWith("name:")); - assertFalse(details.getVersion().startsWith("version:")); - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/location/basic/WinRmMachineLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/location/basic/WinRmMachineLocationLiveTest.java b/software/base/src/test/java/brooklyn/location/basic/WinRmMachineLocationLiveTest.java deleted file mode 100644 index 5baf071..0000000 --- a/software/base/src/test/java/brooklyn/location/basic/WinRmMachineLocationLiveTest.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package brooklyn.location.basic; - -import static org.testng.Assert.assertEquals; - -import org.apache.brooklyn.test.entity.LocalManagementContextForTests; -import org.apache.brooklyn.test.entity.TestApplication; - -import io.cloudsoft.winrm4j.winrm.WinRmToolResponse; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - -import brooklyn.config.BrooklynProperties; -import brooklyn.entity.BrooklynAppLiveTestSupport; -import brooklyn.entity.basic.Entities; -import brooklyn.location.jclouds.JcloudsLocation; -import brooklyn.location.jclouds.JcloudsWinRmMachineLocation; -import brooklyn.management.internal.ManagementContextInternal; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; - -public class WinRmMachineLocationLiveTest { - - // FIXME failing locally with: - // Caused by: Traceback (most recent call last): - // File "__pyclasspath__/winrm/__init__.py", line 40, in run_cmd - // File "__pyclasspath__/winrm/protocol.py", line 118, in open_shell - // File "__pyclasspath__/winrm/protocol.py", line 190, in send_message - // File "__pyclasspath__/winrm/transport.py", line 112, in send_message - // winrm.exceptions.WinRMTransportError: 500 WinRMTransport. [Errno 20001] getaddrinfo failed - // at org.python.core.PyException.doRaise(PyException.java:226) - - private static final Logger LOG = LoggerFactory.getLogger(BrooklynAppLiveTestSupport.class); - - protected JcloudsLocation loc; - protected TestApplication app; - protected ManagementContextInternal mgmt; - - private JcloudsWinRmMachineLocation machine; - - @BeforeClass(alwaysRun=true) - public void setUpClass() throws Exception { - mgmt = new LocalManagementContextForTests(BrooklynProperties.Factory.newDefault()); - JcloudsLocation loc = (JcloudsLocation) mgmt.getLocationRegistry().resolve("jclouds:aws-ec2:us-west-2", ImmutableMap.of( - "inboundPorts", ImmutableList.of(5985, 3389), - "displayName", "AWS Oregon (Windows)", - "imageId", "us-west-2/ami-8fd3f9bf", - "hardwareId", "m3.medium", - "useJcloudsSshInit", false)); - machine = (JcloudsWinRmMachineLocation) loc.obtain(); - } - - @AfterClass(alwaysRun=true) - public void tearDownClass() throws Exception { - try { - if (machine != null) loc.release(machine); - if (mgmt != null) Entities.destroyAll(mgmt); - } catch (Throwable t) { - LOG.error("Caught exception in tearDown method", t); - } finally { - mgmt = null; - } - } - - @Test(groups="Live") - public void testExecScript() throws Exception { - WinRmToolResponse response = machine.executeScript("echo true"); - assertEquals(response.getStatusCode(), 0); - assertEquals(response.getStdErr(), ""); - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/location/basic/WinRmMachineLocationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/location/basic/WinRmMachineLocationTest.java b/software/base/src/test/java/brooklyn/location/basic/WinRmMachineLocationTest.java deleted file mode 100644 index de9db6c..0000000 --- a/software/base/src/test/java/brooklyn/location/basic/WinRmMachineLocationTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package brooklyn.location.basic; - -import static org.testng.Assert.assertEquals; - -import org.testng.annotations.Test; - -import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.entity.basic.BrooklynConfigKeys; -import brooklyn.location.LocationSpec; -import brooklyn.util.net.Networking; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; - -public class WinRmMachineLocationTest extends BrooklynAppUnitTestSupport { - - @Test - public void testConfigurePrivateAddresses() throws Exception { - WinRmMachineLocation host = mgmt.getLocationManager().createLocation(LocationSpec.create(WinRmMachineLocation.class) - .configure("address", Networking.getLocalHost()) - .configure(WinRmMachineLocation.PRIVATE_ADDRESSES, ImmutableList.of("1.2.3.4")) - .configure(BrooklynConfigKeys.SKIP_ON_BOX_BASE_DIR_RESOLUTION, true)); - - assertEquals(host.getPrivateAddresses(), ImmutableSet.of("1.2.3.4")); - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java b/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java index 003fb8e..fac6ee4 100644 --- a/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java +++ b/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java @@ -40,7 +40,7 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.proxying.EntityProxy; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.management.internal.UsageListener.ApplicationMetadata; import brooklyn.management.usage.ApplicationUsage.ApplicationEvent; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java b/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java index 26f20bc..fb047ef 100644 --- a/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java +++ b/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java @@ -34,11 +34,11 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.SoftwareProcessEntityTest; -import brooklyn.location.Location; -import brooklyn.location.LocationSpec; -import brooklyn.location.NoMachinesAvailableException; -import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.LocationSpec; +import org.apache.brooklyn.location.NoMachinesAvailableException; +import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.management.internal.UsageListener.LocationMetadata; import brooklyn.management.usage.LocationUsage.LocationEvent; import brooklyn.test.Asserts; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java b/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java index 9812d45..ea3dedb 100644 --- a/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java +++ b/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java @@ -32,7 +32,7 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; -import brooklyn.location.Location; +import org.apache.brooklyn.location.Location; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.management.internal.UsageManager; import brooklyn.test.Asserts; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsEc2LiveTest.java b/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsEc2LiveTest.java new file mode 100644 index 0000000..fce5c94 --- /dev/null +++ b/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsEc2LiveTest.java @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.brooklyn.location.basic; + +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; + +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.test.EntityTestUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.common.collect.ImmutableList; + +import brooklyn.entity.AbstractEc2LiveTest; +import brooklyn.entity.basic.EmptySoftwareProcess; +import brooklyn.entity.trait.Startable; +import org.apache.brooklyn.location.Location; +import org.apache.brooklyn.location.MachineDetails; +import org.apache.brooklyn.location.OsDetails; +import brooklyn.util.collections.MutableMap; + +// This test really belongs in brooklyn-location but depends on AbstractEc2LiveTest in brooklyn-software-base +public class MachineDetailsEc2LiveTest extends AbstractEc2LiveTest { + + private static final Logger LOG = LoggerFactory.getLogger(MachineDetailsEc2LiveTest.class); + private static final int TIMEOUT_MS = 1000 * 60 * 10; // ten minutes + + @Override + protected void doTest(Location loc) throws Exception { + Entity testEntity = app.createAndManageChild(EntitySpec.create(EmptySoftwareProcess.class)); + app.start(ImmutableList.of(loc)); + EntityTestUtils.assertAttributeEqualsEventually(MutableMap.of("timeout", TIMEOUT_MS), + testEntity, Startable.SERVICE_UP, true); + + SshMachineLocation sshLoc = Locations.findUniqueSshMachineLocation(testEntity.getLocations()).get(); + MachineDetails machine = app.getExecutionContext() + .submit(BasicMachineDetails.taskForSshMachineLocation(sshLoc)) + .getUnchecked(); + LOG.info("Found the following at {}: {}", loc, machine); + assertNotNull(machine); + OsDetails details = machine.getOsDetails(); + assertNotNull(details); + assertNotNull(details.getArch()); + assertNotNull(details.getName()); + assertNotNull(details.getVersion()); + assertFalse(details.getArch().startsWith("architecture:")); + assertFalse(details.getName().startsWith("name:")); + assertFalse(details.getVersion().startsWith("version:")); + } +}
