From 3e8321aa8fa5372c7641c11a953bd4e5bf815185 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Fri, 4 Mar 2011 16:14:06 -0500
Subject: [PATCH] updated savvis to the correct naming convention and maven
 dependencies

---
 .../{savvis => savvis-symphony-vpdc}/pom.xml    | 17 ++++++++++++-----
 .../jclouds/savvis/SymphonyVPDCAsyncClient.java |  1 -
 .../org/jclouds/savvis/SymphonyVPDCClient.java  |  0
 .../savvis/SymphonyVPDCContextBuilder.java      |  0
 .../savvis/SymphonyVPDCPropertiesBuilder.java   |  0
 ...SymphonyVPDCComputeServiceContextModule.java |  0
 .../config/SymphonyVPDCRestClientModule.java    |  0
 .../handlers/SymphonyVPDCErrorHandler.java      |  0
 .../domain/network/SymphonyVPDCNetwork.java     |  0
 .../internal/SymphonyVPDCNetworkImpl.java       |  0
 .../savvis/xml/SymphonyVPDCNetworkHandler.java  |  0
 .../savvis/xml/SymphonyVPDCVAppHandler.java     |  0
 .../savvis/SymphonyVPDCAsyncClientTest.java     |  9 ++++-----
 .../savvis/SymphonyVPDCClientLiveTest.java      |  0
 .../handlers/SymphonyVPDCErrorHandlerTest.java  |  0
 .../SymphonyVPDCComputeServiceLiveTest.java     |  0
 16 files changed, 16 insertions(+), 11 deletions(-)
 rename sandbox-providers/{savvis => savvis-symphony-vpdc}/pom.xml (94%)
 rename sandbox-providers/{savvis => savvis-symphony-vpdc}/src/main/java/org/jclouds/savvis/SymphonyVPDCAsyncClient.java (99%)
 rename sandbox-providers/{savvis => savvis-symphony-vpdc}/src/main/java/org/jclouds/savvis/SymphonyVPDCClient.java (100%)
 rename sandbox-providers/{savvis => savvis-symphony-vpdc}/src/main/java/org/jclouds/savvis/SymphonyVPDCContextBuilder.java (100%)
 rename sandbox-providers/{savvis => savvis-symphony-vpdc}/src/main/java/org/jclouds/savvis/SymphonyVPDCPropertiesBuilder.java (100%)
 rename sandbox-providers/{savvis => savvis-symphony-vpdc}/src/main/java/org/jclouds/savvis/compute/config/SymphonyVPDCComputeServiceContextModule.java (100%)
 rename sandbox-providers/{savvis => savvis-symphony-vpdc}/src/main/java/org/jclouds/savvis/config/SymphonyVPDCRestClientModule.java (100%)
 rename sandbox-providers/{savvis => savvis-symphony-vpdc}/src/main/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandler.java (100%)
 rename sandbox-providers/{savvis => savvis-symphony-vpdc}/src/main/java/org/jclouds/vcloud/domain/network/SymphonyVPDCNetwork.java (100%)
 rename sandbox-providers/{savvis => savvis-symphony-vpdc}/src/main/java/org/jclouds/vcloud/domain/network/internal/SymphonyVPDCNetworkImpl.java (100%)
 rename sandbox-providers/{savvis => savvis-symphony-vpdc}/src/main/java/org/jclouds/vcloud/savvis/xml/SymphonyVPDCNetworkHandler.java (100%)
 rename sandbox-providers/{savvis => savvis-symphony-vpdc}/src/main/java/org/jclouds/vcloud/savvis/xml/SymphonyVPDCVAppHandler.java (100%)
 rename sandbox-providers/{savvis => savvis-symphony-vpdc}/src/test/java/org/jclouds/savvis/SymphonyVPDCAsyncClientTest.java (99%)
 rename sandbox-providers/{savvis => savvis-symphony-vpdc}/src/test/java/org/jclouds/savvis/SymphonyVPDCClientLiveTest.java (100%)
 rename sandbox-providers/{savvis => savvis-symphony-vpdc}/src/test/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandlerTest.java (100%)
 rename sandbox-providers/{savvis => savvis-symphony-vpdc}/src/test/java/org/jclouds/vcloud/savvis/compute/SymphonyVPDCComputeServiceLiveTest.java (100%)

diff --git a/sandbox-providers/savvis/pom.xml b/sandbox-providers/savvis-symphony-vpdc/pom.xml
similarity index 94%
rename from sandbox-providers/savvis/pom.xml
rename to sandbox-providers/savvis-symphony-vpdc/pom.xml
index 9b739298d0..d9c357c863 100644
--- a/sandbox-providers/savvis/pom.xml
+++ b/sandbox-providers/savvis-symphony-vpdc/pom.xml
@@ -31,7 +31,7 @@
         <relativePath>../../project/pom.xml</relativePath>
     </parent>
     <groupId>org.jclouds.provider</groupId>
-    <artifactId>savvis</artifactId>
+    <artifactId>savvis-symphony-vpdc</artifactId>
     <name>jclouds savvis core</name>
     <description>jclouds components to access savvis</description>
     
@@ -59,13 +59,13 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-vcloud</artifactId>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>vcloudexpress</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-core</artifactId>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>vcloudexpress</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
@@ -84,6 +84,13 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jclouds</groupId>
+            <artifactId>jclouds-core</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-jsch</artifactId>
diff --git a/sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCAsyncClient.java b/sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/savvis/SymphonyVPDCAsyncClient.java
similarity index 99%
rename from sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCAsyncClient.java
rename to sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/savvis/SymphonyVPDCAsyncClient.java
index 867f000d1f..09d81b1942 100644
--- a/sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCAsyncClient.java
+++ b/sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/savvis/SymphonyVPDCAsyncClient.java
@@ -30,7 +30,6 @@ import org.jclouds.rest.annotations.RequestFilters;
 import org.jclouds.rest.annotations.XMLResponseParser;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 import org.jclouds.vcloud.CommonVCloudClient;
-import org.jclouds.vcloud.VCloudClient;
 import org.jclouds.vcloud.VCloudExpressAsyncClient;
 import org.jclouds.vcloud.domain.Org;
 import org.jclouds.vcloud.domain.VCloudExpressVApp;
diff --git a/sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCClient.java b/sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/savvis/SymphonyVPDCClient.java
similarity index 100%
rename from sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCClient.java
rename to sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/savvis/SymphonyVPDCClient.java
diff --git a/sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCContextBuilder.java b/sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/savvis/SymphonyVPDCContextBuilder.java
similarity index 100%
rename from sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCContextBuilder.java
rename to sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/savvis/SymphonyVPDCContextBuilder.java
diff --git a/sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCPropertiesBuilder.java b/sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/savvis/SymphonyVPDCPropertiesBuilder.java
similarity index 100%
rename from sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCPropertiesBuilder.java
rename to sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/savvis/SymphonyVPDCPropertiesBuilder.java
diff --git a/sandbox-providers/savvis/src/main/java/org/jclouds/savvis/compute/config/SymphonyVPDCComputeServiceContextModule.java b/sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/savvis/compute/config/SymphonyVPDCComputeServiceContextModule.java
similarity index 100%
rename from sandbox-providers/savvis/src/main/java/org/jclouds/savvis/compute/config/SymphonyVPDCComputeServiceContextModule.java
rename to sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/savvis/compute/config/SymphonyVPDCComputeServiceContextModule.java
diff --git a/sandbox-providers/savvis/src/main/java/org/jclouds/savvis/config/SymphonyVPDCRestClientModule.java b/sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/savvis/config/SymphonyVPDCRestClientModule.java
similarity index 100%
rename from sandbox-providers/savvis/src/main/java/org/jclouds/savvis/config/SymphonyVPDCRestClientModule.java
rename to sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/savvis/config/SymphonyVPDCRestClientModule.java
diff --git a/sandbox-providers/savvis/src/main/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandler.java b/sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandler.java
similarity index 100%
rename from sandbox-providers/savvis/src/main/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandler.java
rename to sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandler.java
diff --git a/sandbox-providers/savvis/src/main/java/org/jclouds/vcloud/domain/network/SymphonyVPDCNetwork.java b/sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/vcloud/domain/network/SymphonyVPDCNetwork.java
similarity index 100%
rename from sandbox-providers/savvis/src/main/java/org/jclouds/vcloud/domain/network/SymphonyVPDCNetwork.java
rename to sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/vcloud/domain/network/SymphonyVPDCNetwork.java
diff --git a/sandbox-providers/savvis/src/main/java/org/jclouds/vcloud/domain/network/internal/SymphonyVPDCNetworkImpl.java b/sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/vcloud/domain/network/internal/SymphonyVPDCNetworkImpl.java
similarity index 100%
rename from sandbox-providers/savvis/src/main/java/org/jclouds/vcloud/domain/network/internal/SymphonyVPDCNetworkImpl.java
rename to sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/vcloud/domain/network/internal/SymphonyVPDCNetworkImpl.java
diff --git a/sandbox-providers/savvis/src/main/java/org/jclouds/vcloud/savvis/xml/SymphonyVPDCNetworkHandler.java b/sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/vcloud/savvis/xml/SymphonyVPDCNetworkHandler.java
similarity index 100%
rename from sandbox-providers/savvis/src/main/java/org/jclouds/vcloud/savvis/xml/SymphonyVPDCNetworkHandler.java
rename to sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/vcloud/savvis/xml/SymphonyVPDCNetworkHandler.java
diff --git a/sandbox-providers/savvis/src/main/java/org/jclouds/vcloud/savvis/xml/SymphonyVPDCVAppHandler.java b/sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/vcloud/savvis/xml/SymphonyVPDCVAppHandler.java
similarity index 100%
rename from sandbox-providers/savvis/src/main/java/org/jclouds/vcloud/savvis/xml/SymphonyVPDCVAppHandler.java
rename to sandbox-providers/savvis-symphony-vpdc/src/main/java/org/jclouds/vcloud/savvis/xml/SymphonyVPDCVAppHandler.java
diff --git a/sandbox-providers/savvis/src/test/java/org/jclouds/savvis/SymphonyVPDCAsyncClientTest.java b/sandbox-providers/savvis-symphony-vpdc/src/test/java/org/jclouds/savvis/SymphonyVPDCAsyncClientTest.java
similarity index 99%
rename from sandbox-providers/savvis/src/test/java/org/jclouds/savvis/SymphonyVPDCAsyncClientTest.java
rename to sandbox-providers/savvis-symphony-vpdc/src/test/java/org/jclouds/savvis/SymphonyVPDCAsyncClientTest.java
index 3855497930..6941b70844 100644
--- a/sandbox-providers/savvis/src/test/java/org/jclouds/savvis/SymphonyVPDCAsyncClientTest.java
+++ b/sandbox-providers/savvis-symphony-vpdc/src/test/java/org/jclouds/savvis/SymphonyVPDCAsyncClientTest.java
@@ -50,8 +50,10 @@ import org.jclouds.rest.internal.RestAnnotationProcessor;
 import org.jclouds.savvis.config.SymphonyVPDCRestClientModule;
 import org.jclouds.util.Strings2;
 import org.jclouds.vcloud.CommonVCloudClient;
-import org.jclouds.vcloud.VCloudAsyncClient;
+import org.jclouds.vcloud.VCloudExpressAsyncClient;
+import org.jclouds.vcloud.VCloudExpressLoginAsyncClient;
 import org.jclouds.vcloud.VCloudExpressMediaType;
+import org.jclouds.vcloud.VCloudVersionsAsyncClient;
 import org.jclouds.vcloud.domain.Org;
 import org.jclouds.vcloud.domain.ReferenceType;
 import org.jclouds.vcloud.domain.Task;
@@ -85,9 +87,6 @@ import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.inject.TypeLiteral;
 
-import domain.VCloudExpressLoginAsyncClient;
-import domain.VCloudVersionsAsyncClient;
-
 /**
  * Tests annotation parsing of {@code SymphonyVPDCAsyncClient}
  * 
@@ -453,7 +452,7 @@ public class SymphonyVPDCAsyncClientTest extends RestClientTest<SymphonyVPDCAsyn
    }
 
    public void testFindTasksListInOrgNamed() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = VCloudAsyncClient.class.getMethod("findTasksListInOrgNamed", String.class);
+      Method method = VCloudExpressAsyncClient.class.getMethod("findTasksListInOrgNamed", String.class);
       HttpRequest request = processor.createRequest(method, "org");
 
       assertRequestLineEquals(request,
diff --git a/sandbox-providers/savvis/src/test/java/org/jclouds/savvis/SymphonyVPDCClientLiveTest.java b/sandbox-providers/savvis-symphony-vpdc/src/test/java/org/jclouds/savvis/SymphonyVPDCClientLiveTest.java
similarity index 100%
rename from sandbox-providers/savvis/src/test/java/org/jclouds/savvis/SymphonyVPDCClientLiveTest.java
rename to sandbox-providers/savvis-symphony-vpdc/src/test/java/org/jclouds/savvis/SymphonyVPDCClientLiveTest.java
diff --git a/sandbox-providers/savvis/src/test/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandlerTest.java b/sandbox-providers/savvis-symphony-vpdc/src/test/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandlerTest.java
similarity index 100%
rename from sandbox-providers/savvis/src/test/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandlerTest.java
rename to sandbox-providers/savvis-symphony-vpdc/src/test/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandlerTest.java
diff --git a/sandbox-providers/savvis/src/test/java/org/jclouds/vcloud/savvis/compute/SymphonyVPDCComputeServiceLiveTest.java b/sandbox-providers/savvis-symphony-vpdc/src/test/java/org/jclouds/vcloud/savvis/compute/SymphonyVPDCComputeServiceLiveTest.java
similarity index 100%
rename from sandbox-providers/savvis/src/test/java/org/jclouds/vcloud/savvis/compute/SymphonyVPDCComputeServiceLiveTest.java
rename to sandbox-providers/savvis-symphony-vpdc/src/test/java/org/jclouds/vcloud/savvis/compute/SymphonyVPDCComputeServiceLiveTest.java