From 5d6186bce9b776fd7d45487314ce05d3ff6d490a Mon Sep 17 00:00:00 2001 From: Mattias Holmqvist Date: Thu, 20 Oct 2011 19:43:44 +0200 Subject: [PATCH] Moved functions to admin package. --- .../{ => admin}/StartVBoxIfNotAlreadyRunning.java | 2 +- .../experiment/SetupVirtualBoxForLiveTest.java | 10 +--------- .../StartVBoxIfNotAlreadyRunningLiveTest.java | 3 ++- 3 files changed, 4 insertions(+), 11 deletions(-) rename sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/{ => admin}/StartVBoxIfNotAlreadyRunning.java (98%) rename sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/{ => admin}/StartVBoxIfNotAlreadyRunningLiveTest.java (94%) diff --git a/sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/StartVBoxIfNotAlreadyRunning.java b/sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/StartVBoxIfNotAlreadyRunning.java similarity index 98% rename from sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/StartVBoxIfNotAlreadyRunning.java rename to sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/StartVBoxIfNotAlreadyRunning.java index f0bea271b3..6d68bf92fc 100644 --- a/sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/StartVBoxIfNotAlreadyRunning.java +++ b/sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/StartVBoxIfNotAlreadyRunning.java @@ -19,7 +19,7 @@ * */ -package org.jclouds.virtualbox.functions; +package org.jclouds.virtualbox.functions.admin; import com.google.common.base.Function; diff --git a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/experiment/SetupVirtualBoxForLiveTest.java b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/experiment/SetupVirtualBoxForLiveTest.java index a21839dddf..9ed33c02e3 100644 --- a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/experiment/SetupVirtualBoxForLiveTest.java +++ b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/experiment/SetupVirtualBoxForLiveTest.java @@ -34,23 +34,15 @@ import java.io.IOException; import java.io.InputStream; import java.net.URI; -import org.eclipse.jetty.server.Handler; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.handler.DefaultHandler; -import org.eclipse.jetty.server.handler.HandlerList; -import org.eclipse.jetty.server.handler.ResourceHandler; import org.jclouds.compute.ComputeServiceContext; import org.jclouds.compute.domain.ExecResponse; import org.jclouds.compute.options.RunScriptOptions; import org.jclouds.domain.Credentials; import org.jclouds.logging.Logger; -import org.jclouds.net.IPSocket; -import org.jclouds.predicates.InetSocketAddressConnect; import org.jclouds.virtualbox.config.VirtualBoxConstants; -import org.jclouds.virtualbox.functions.StartVBoxIfNotAlreadyRunning; +import org.jclouds.virtualbox.functions.admin.StartVBoxIfNotAlreadyRunning; import org.jclouds.virtualbox.functions.admin.StartJettyIfNotAlreadyRunning; import org.testng.annotations.AfterSuite; -import org.testng.annotations.BeforeGroups; import org.testng.annotations.BeforeSuite; import com.google.common.base.Splitter; diff --git a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/StartVBoxIfNotAlreadyRunningLiveTest.java b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/admin/StartVBoxIfNotAlreadyRunningLiveTest.java similarity index 94% rename from sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/StartVBoxIfNotAlreadyRunningLiveTest.java rename to sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/admin/StartVBoxIfNotAlreadyRunningLiveTest.java index 8b167a408a..1d838d569c 100644 --- a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/StartVBoxIfNotAlreadyRunningLiveTest.java +++ b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/admin/StartVBoxIfNotAlreadyRunningLiveTest.java @@ -19,10 +19,11 @@ * */ -package org.jclouds.virtualbox.functions; +package org.jclouds.virtualbox.functions.admin; import org.jclouds.compute.ComputeServiceContext; import org.jclouds.domain.Credentials; +import org.jclouds.virtualbox.functions.admin.StartVBoxIfNotAlreadyRunning; import org.testng.annotations.Test; import org.virtualbox_4_1.SessionState; import org.virtualbox_4_1.VirtualBoxManager;