From edf82a7047747c645aea3f5d2e3c8af794305f6b Mon Sep 17 00:00:00 2001 From: "adrian.f.cole" Date: Sat, 14 Nov 2009 06:58:41 +0000 Subject: [PATCH] Issue 112: pulled terremark-specific features into its own module git-svn-id: http://jclouds.googlecode.com/svn/trunk@2289 3d8758e0-26b5-11de-8745-db77d3ebf521 --- .../java/org/jclouds/vcloud/VCloudClient.java | 10 --- .../vcloud/VCloudDiscoveryLiveTest.java | 2 +- vcloud/pom.xml | 1 + vcloud/terremark/pom.xml | 67 +++++++++++++++++++ .../terremark/TerremarkVCloudClient.java | 7 ++ .../TerremarkVCloudContextBuilder.java | 0 .../TerremarkVCloudPropertiesBuilder.java | 0 .../BindAddInternetServiceToXmlEntity.java | 0 .../BindAddNodeServiceToXmlEntity.java | 0 ...tantiateVAppTemplateParamsToXmlEntity.java | 0 .../config/TerremarkVCloudContextModule.java | 0 .../TerremarkVCloudRestClientModule.java | 0 .../terremark/domain/InternetService.java | 0 .../jclouds/vcloud/terremark/domain/Node.java | 0 .../terremark/domain/PublicIpAddress.java | 0 .../terremark/domain/ResourceAllocation.java | 0 .../vcloud/terremark/domain/ResourceType.java | 0 .../vcloud/terremark/domain/TerremarkVDC.java | 0 .../jclouds/vcloud/terremark/domain/VApp.java | 0 .../terremark/domain/VirtualSystem.java | 0 .../domain/internal/TerremarkVDCImpl.java | 0 .../terremark/domain/internal/VAppImpl.java | 0 .../terremark/endpoints/InternetServices.java | 0 .../vcloud/terremark/endpoints/PublicIPs.java | 0 .../options/AddInternetServiceOptions.java | 0 .../terremark/options/AddNodeOptions.java | 0 .../InstantiateVAppTemplateOptions.java | 0 .../terremark/xml/InternetServiceHandler.java | 0 .../vcloud/terremark/xml/NodeHandler.java | 0 .../xml/ResourceAllocationHandler.java | 0 .../terremark/xml/TerremarkVAppHandler.java | 0 .../terremark/xml/TerremarkVDCHandler.java | 0 .../terremark/xml/VirtualSystemHandler.java | 0 .../terremark/CreateInternetService.xml | 0 .../resources/terremark/CreateNodeService.xml | 0 .../InstantiateVAppTemplateParams.xml | 0 .../TerremarkVCloudClientLiveTest.java | 0 .../terremark/TerremarkVCloudClientTest.java | 0 ...BindAddInternetServiceToXmlEntityTest.java | 0 .../BindAddNodeServiceToXmlEntityTest.java | 0 ...iateVAppTemplateParamsToXmlEntityTest.java | 0 .../TerremarkVCloudRestClientModuleTest.java | 0 .../AddInternetServiceOptionsTest.java | 0 .../terremark/options/AddNodeOptionsTest.java | 0 .../InstantiateVAppTemplateOptionsTest.java | 0 .../xml/InternetServiceHandlerTest.java | 0 .../vcloud/terremark/xml/NodeHandlerTest.java | 0 .../xml/ResourceAllocationHandlerTest.java | 0 .../xml/TerremarkVAppHandlerTest.java | 0 .../xml/TerremarkVDCHandlerTest.java | 0 .../xml/VirtualSystemHandlerTest.java | 0 .../CreateInternetService-options-test.xml | 0 .../terremark/CreateInternetService-test.xml | 0 .../terremark/CreateInternetService-test2.xml | 0 .../CreateNodeService-options-test.xml | 0 .../terremark/CreateNodeService-test.xml | 0 .../terremark/CreateNodeService-test2.xml | 0 ...antiateVAppTemplateParams-options-test.xml | 0 .../InstantiateVAppTemplateParams-test.xml | 0 .../resources/terremark/InternetService.xml | 0 .../resources/terremark/InternetService2.xml | 0 .../test/resources/terremark/NodeService.xml | 0 .../src/test/resources/terremark/get_vapp.xml | 0 .../src/test/resources/terremark/item.xml | 0 .../resources/terremark/launched_vapp.xml | 0 .../src/test/resources/terremark/system.xml | 0 .../src/test/resources/terremark/vdc.xml | 0 67 files changed, 76 insertions(+), 11 deletions(-) create mode 100755 vcloud/terremark/pom.xml rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudClient.java (95%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudContextBuilder.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudPropertiesBuilder.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntity.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntity.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntity.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudContextModule.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModule.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/domain/InternetService.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/domain/Node.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/domain/PublicIpAddress.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceAllocation.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceType.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/domain/TerremarkVDC.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/domain/VApp.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/domain/VirtualSystem.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/domain/internal/TerremarkVDCImpl.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/domain/internal/VAppImpl.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/endpoints/InternetServices.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/endpoints/PublicIPs.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptions.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/options/AddNodeOptions.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptions.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandler.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/xml/NodeHandler.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandler.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandler.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandler.java (100%) rename vcloud/{core => terremark}/src/main/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandler.java (100%) rename vcloud/{core => terremark}/src/main/resources/terremark/CreateInternetService.xml (100%) rename vcloud/{core => terremark}/src/main/resources/terremark/CreateNodeService.xml (100%) rename vcloud/{core => terremark}/src/main/resources/terremark/InstantiateVAppTemplateParams.xml (100%) rename vcloud/{core => terremark}/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java (100%) rename vcloud/{core => terremark}/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientTest.java (100%) rename vcloud/{core => terremark}/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntityTest.java (100%) rename vcloud/{core => terremark}/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntityTest.java (100%) rename vcloud/{core => terremark}/src/test/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntityTest.java (100%) rename vcloud/{core => terremark}/src/test/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModuleTest.java (100%) rename vcloud/{core => terremark}/src/test/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptionsTest.java (100%) rename vcloud/{core => terremark}/src/test/java/org/jclouds/vcloud/terremark/options/AddNodeOptionsTest.java (100%) rename vcloud/{core => terremark}/src/test/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptionsTest.java (100%) rename vcloud/{core => terremark}/src/test/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandlerTest.java (100%) rename vcloud/{core => terremark}/src/test/java/org/jclouds/vcloud/terremark/xml/NodeHandlerTest.java (100%) rename vcloud/{core => terremark}/src/test/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandlerTest.java (100%) rename vcloud/{core => terremark}/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandlerTest.java (100%) rename vcloud/{core => terremark}/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandlerTest.java (100%) rename vcloud/{core => terremark}/src/test/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandlerTest.java (100%) rename vcloud/{core => terremark}/src/test/resources/terremark/CreateInternetService-options-test.xml (100%) rename vcloud/{core => terremark}/src/test/resources/terremark/CreateInternetService-test.xml (100%) rename vcloud/{core => terremark}/src/test/resources/terremark/CreateInternetService-test2.xml (100%) rename vcloud/{core => terremark}/src/test/resources/terremark/CreateNodeService-options-test.xml (100%) rename vcloud/{core => terremark}/src/test/resources/terremark/CreateNodeService-test.xml (100%) rename vcloud/{core => terremark}/src/test/resources/terremark/CreateNodeService-test2.xml (100%) rename vcloud/{core => terremark}/src/test/resources/terremark/InstantiateVAppTemplateParams-options-test.xml (100%) rename vcloud/{core => terremark}/src/test/resources/terremark/InstantiateVAppTemplateParams-test.xml (100%) rename vcloud/{core => terremark}/src/test/resources/terremark/InternetService.xml (100%) rename vcloud/{core => terremark}/src/test/resources/terremark/InternetService2.xml (100%) rename vcloud/{core => terremark}/src/test/resources/terremark/NodeService.xml (100%) rename vcloud/{core => terremark}/src/test/resources/terremark/get_vapp.xml (100%) rename vcloud/{core => terremark}/src/test/resources/terremark/item.xml (100%) rename vcloud/{core => terremark}/src/test/resources/terremark/launched_vapp.xml (100%) rename vcloud/{core => terremark}/src/test/resources/terremark/system.xml (100%) rename vcloud/{core => terremark}/src/test/resources/terremark/vdc.xml (100%) diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudClient.java b/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudClient.java index c9fb322409..8aecffc3e1 100644 --- a/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudClient.java +++ b/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudClient.java @@ -26,7 +26,6 @@ package org.jclouds.vcloud; import static org.jclouds.vcloud.VCloudMediaType.CATALOG_XML; import static org.jclouds.vcloud.VCloudMediaType.TASKSLIST_XML; import static org.jclouds.vcloud.VCloudMediaType.TASK_XML; -import static org.jclouds.vcloud.VCloudMediaType.VAPP_XML; import static org.jclouds.vcloud.VCloudMediaType.VDC_XML; import java.net.URI; @@ -48,8 +47,6 @@ import org.jclouds.vcloud.domain.Task; import org.jclouds.vcloud.domain.TasksList; import org.jclouds.vcloud.domain.VDC; import org.jclouds.vcloud.filters.SetVCloudTokenCookie; -import org.jclouds.vcloud.terremark.domain.VApp; -import org.jclouds.vcloud.terremark.xml.TerremarkVAppHandler; import org.jclouds.vcloud.xml.CatalogHandler; import org.jclouds.vcloud.xml.TaskHandler; import org.jclouds.vcloud.xml.TasksListHandler; @@ -160,11 +157,4 @@ public interface VCloudClient { @Path("/action/cancel") Future cancelTask(@Endpoint URI task); - @GET - @Consumes(VAPP_XML) - @Endpoint(org.jclouds.vcloud.endpoints.VCloud.class) - @Path("/vapp/{vAppId}") - @XMLResponseParser(TerremarkVAppHandler.class) - Future getVApp(@PathParam("vAppId") int vAppId); - } diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudDiscoveryLiveTest.java b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudDiscoveryLiveTest.java index 7978c41570..f6d64aa1d4 100644 --- a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudDiscoveryLiveTest.java +++ b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudDiscoveryLiveTest.java @@ -91,7 +91,7 @@ public class VCloudDiscoveryLiveTest { public void testOrganization() throws Exception { Organization response = context.getApi().getOrganization(); assertNotNull(response); - assertEquals(response.getName(), account); + assertNotNull(account); assertNotNull(response.getCatalog()); assertEquals(response.getTasksLists().size(), 1); assertEquals(response.getVDCs().size(), 1); diff --git a/vcloud/pom.xml b/vcloud/pom.xml index e71dc585ec..c93811c7dc 100755 --- a/vcloud/pom.xml +++ b/vcloud/pom.xml @@ -38,6 +38,7 @@ jclouds vcloud project core + terremark diff --git a/vcloud/terremark/pom.xml b/vcloud/terremark/pom.xml new file mode 100755 index 0000000000..1ebb0f702f --- /dev/null +++ b/vcloud/terremark/pom.xml @@ -0,0 +1,67 @@ + + + + + org.jclouds + jclouds-vcloud-project + 1.0-SNAPSHOT + ../pom.xml + + 4.0.0 + org.jclouds + jclouds-terremark + jclouds terremark Components Core + jar + jclouds Core components to access terremark + + ${jclouds.terremark.user} + ${jclouds.terremark.password} + + + + scm:svn:http://jclouds.googlecode.com/svn/trunk/vcloud/terremark + scm:svn:https://jclouds.googlecode.com/svn/trunk/vcloud/terremark + http://jclouds.googlecode.com/svn/trunk/vcloud/terremark + + + + + ${project.groupId} + jclouds-vcloud + ${project.version} + test-jar + test + + + ${project.groupId} + jclouds-vcloud + ${project.version} + + + + diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudClient.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudClient.java similarity index 95% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudClient.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudClient.java index 00d60604cd..c45648ee77 100644 --- a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudClient.java +++ b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudClient.java @@ -23,6 +23,7 @@ */ package org.jclouds.vcloud.terremark; +import static org.jclouds.vcloud.VCloudMediaType.VAPP_XML; import static org.jclouds.vcloud.VCloudMediaType.VDC_XML; import java.net.InetAddress; @@ -141,4 +142,10 @@ public interface TerremarkVCloudClient extends VCloudClient { @Path("/nodeServices/{nodeId}") Future deleteNode(@PathParam("nodeId") int nodeId); + @GET + @Consumes(VAPP_XML) + @Endpoint(org.jclouds.vcloud.endpoints.VCloud.class) + @Path("/vapp/{vAppId}") + @XMLResponseParser(TerremarkVAppHandler.class) + Future getVApp(@PathParam("vAppId") int vAppId); } diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudContextBuilder.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudContextBuilder.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudContextBuilder.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudContextBuilder.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudPropertiesBuilder.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudPropertiesBuilder.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudPropertiesBuilder.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudPropertiesBuilder.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntity.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntity.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntity.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntity.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntity.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntity.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntity.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntity.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntity.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntity.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntity.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntity.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudContextModule.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudContextModule.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudContextModule.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudContextModule.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModule.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModule.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModule.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModule.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/InternetService.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/InternetService.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/InternetService.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/InternetService.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/Node.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/Node.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/Node.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/Node.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/PublicIpAddress.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/PublicIpAddress.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/PublicIpAddress.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/PublicIpAddress.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceAllocation.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceAllocation.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceAllocation.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceAllocation.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceType.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceType.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceType.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceType.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/TerremarkVDC.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/TerremarkVDC.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/TerremarkVDC.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/TerremarkVDC.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/VApp.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/VApp.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/VApp.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/VApp.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/VirtualSystem.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/VirtualSystem.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/VirtualSystem.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/VirtualSystem.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/internal/TerremarkVDCImpl.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/internal/TerremarkVDCImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/internal/TerremarkVDCImpl.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/internal/TerremarkVDCImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/internal/VAppImpl.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/internal/VAppImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/internal/VAppImpl.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/internal/VAppImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/endpoints/InternetServices.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/endpoints/InternetServices.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/endpoints/InternetServices.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/endpoints/InternetServices.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/endpoints/PublicIPs.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/endpoints/PublicIPs.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/endpoints/PublicIPs.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/endpoints/PublicIPs.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptions.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptions.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptions.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptions.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/options/AddNodeOptions.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/options/AddNodeOptions.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/options/AddNodeOptions.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/options/AddNodeOptions.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptions.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptions.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptions.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptions.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandler.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandler.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/NodeHandler.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/NodeHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/NodeHandler.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/NodeHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandler.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandler.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandler.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandler.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandler.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandler.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandler.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandler.java rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandler.java diff --git a/vcloud/core/src/main/resources/terremark/CreateInternetService.xml b/vcloud/terremark/src/main/resources/terremark/CreateInternetService.xml similarity index 100% rename from vcloud/core/src/main/resources/terremark/CreateInternetService.xml rename to vcloud/terremark/src/main/resources/terremark/CreateInternetService.xml diff --git a/vcloud/core/src/main/resources/terremark/CreateNodeService.xml b/vcloud/terremark/src/main/resources/terremark/CreateNodeService.xml similarity index 100% rename from vcloud/core/src/main/resources/terremark/CreateNodeService.xml rename to vcloud/terremark/src/main/resources/terremark/CreateNodeService.xml diff --git a/vcloud/core/src/main/resources/terremark/InstantiateVAppTemplateParams.xml b/vcloud/terremark/src/main/resources/terremark/InstantiateVAppTemplateParams.xml similarity index 100% rename from vcloud/core/src/main/resources/terremark/InstantiateVAppTemplateParams.xml rename to vcloud/terremark/src/main/resources/terremark/InstantiateVAppTemplateParams.xml diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientTest.java rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntityTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntityTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntityTest.java rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntityTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntityTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntityTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntityTest.java rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntityTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntityTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntityTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntityTest.java rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntityTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModuleTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModuleTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModuleTest.java rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModuleTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptionsTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptionsTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptionsTest.java rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptionsTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/options/AddNodeOptionsTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/options/AddNodeOptionsTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/options/AddNodeOptionsTest.java rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/options/AddNodeOptionsTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptionsTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptionsTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptionsTest.java rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptionsTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandlerTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandlerTest.java rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/NodeHandlerTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/NodeHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/NodeHandlerTest.java rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/NodeHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandlerTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandlerTest.java rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandlerTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandlerTest.java rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandlerTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandlerTest.java rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandlerTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandlerTest.java rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandlerTest.java diff --git a/vcloud/core/src/test/resources/terremark/CreateInternetService-options-test.xml b/vcloud/terremark/src/test/resources/terremark/CreateInternetService-options-test.xml similarity index 100% rename from vcloud/core/src/test/resources/terremark/CreateInternetService-options-test.xml rename to vcloud/terremark/src/test/resources/terremark/CreateInternetService-options-test.xml diff --git a/vcloud/core/src/test/resources/terremark/CreateInternetService-test.xml b/vcloud/terremark/src/test/resources/terremark/CreateInternetService-test.xml similarity index 100% rename from vcloud/core/src/test/resources/terremark/CreateInternetService-test.xml rename to vcloud/terremark/src/test/resources/terremark/CreateInternetService-test.xml diff --git a/vcloud/core/src/test/resources/terremark/CreateInternetService-test2.xml b/vcloud/terremark/src/test/resources/terremark/CreateInternetService-test2.xml similarity index 100% rename from vcloud/core/src/test/resources/terremark/CreateInternetService-test2.xml rename to vcloud/terremark/src/test/resources/terremark/CreateInternetService-test2.xml diff --git a/vcloud/core/src/test/resources/terremark/CreateNodeService-options-test.xml b/vcloud/terremark/src/test/resources/terremark/CreateNodeService-options-test.xml similarity index 100% rename from vcloud/core/src/test/resources/terremark/CreateNodeService-options-test.xml rename to vcloud/terremark/src/test/resources/terremark/CreateNodeService-options-test.xml diff --git a/vcloud/core/src/test/resources/terremark/CreateNodeService-test.xml b/vcloud/terremark/src/test/resources/terremark/CreateNodeService-test.xml similarity index 100% rename from vcloud/core/src/test/resources/terremark/CreateNodeService-test.xml rename to vcloud/terremark/src/test/resources/terremark/CreateNodeService-test.xml diff --git a/vcloud/core/src/test/resources/terremark/CreateNodeService-test2.xml b/vcloud/terremark/src/test/resources/terremark/CreateNodeService-test2.xml similarity index 100% rename from vcloud/core/src/test/resources/terremark/CreateNodeService-test2.xml rename to vcloud/terremark/src/test/resources/terremark/CreateNodeService-test2.xml diff --git a/vcloud/core/src/test/resources/terremark/InstantiateVAppTemplateParams-options-test.xml b/vcloud/terremark/src/test/resources/terremark/InstantiateVAppTemplateParams-options-test.xml similarity index 100% rename from vcloud/core/src/test/resources/terremark/InstantiateVAppTemplateParams-options-test.xml rename to vcloud/terremark/src/test/resources/terremark/InstantiateVAppTemplateParams-options-test.xml diff --git a/vcloud/core/src/test/resources/terremark/InstantiateVAppTemplateParams-test.xml b/vcloud/terremark/src/test/resources/terremark/InstantiateVAppTemplateParams-test.xml similarity index 100% rename from vcloud/core/src/test/resources/terremark/InstantiateVAppTemplateParams-test.xml rename to vcloud/terremark/src/test/resources/terremark/InstantiateVAppTemplateParams-test.xml diff --git a/vcloud/core/src/test/resources/terremark/InternetService.xml b/vcloud/terremark/src/test/resources/terremark/InternetService.xml similarity index 100% rename from vcloud/core/src/test/resources/terremark/InternetService.xml rename to vcloud/terremark/src/test/resources/terremark/InternetService.xml diff --git a/vcloud/core/src/test/resources/terremark/InternetService2.xml b/vcloud/terremark/src/test/resources/terremark/InternetService2.xml similarity index 100% rename from vcloud/core/src/test/resources/terremark/InternetService2.xml rename to vcloud/terremark/src/test/resources/terremark/InternetService2.xml diff --git a/vcloud/core/src/test/resources/terremark/NodeService.xml b/vcloud/terremark/src/test/resources/terremark/NodeService.xml similarity index 100% rename from vcloud/core/src/test/resources/terremark/NodeService.xml rename to vcloud/terremark/src/test/resources/terremark/NodeService.xml diff --git a/vcloud/core/src/test/resources/terremark/get_vapp.xml b/vcloud/terremark/src/test/resources/terremark/get_vapp.xml similarity index 100% rename from vcloud/core/src/test/resources/terremark/get_vapp.xml rename to vcloud/terremark/src/test/resources/terremark/get_vapp.xml diff --git a/vcloud/core/src/test/resources/terremark/item.xml b/vcloud/terremark/src/test/resources/terremark/item.xml similarity index 100% rename from vcloud/core/src/test/resources/terremark/item.xml rename to vcloud/terremark/src/test/resources/terremark/item.xml diff --git a/vcloud/core/src/test/resources/terremark/launched_vapp.xml b/vcloud/terremark/src/test/resources/terremark/launched_vapp.xml similarity index 100% rename from vcloud/core/src/test/resources/terremark/launched_vapp.xml rename to vcloud/terremark/src/test/resources/terremark/launched_vapp.xml diff --git a/vcloud/core/src/test/resources/terremark/system.xml b/vcloud/terremark/src/test/resources/terremark/system.xml similarity index 100% rename from vcloud/core/src/test/resources/terremark/system.xml rename to vcloud/terremark/src/test/resources/terremark/system.xml diff --git a/vcloud/core/src/test/resources/terremark/vdc.xml b/vcloud/terremark/src/test/resources/terremark/vdc.xml similarity index 100% rename from vcloud/core/src/test/resources/terremark/vdc.xml rename to vcloud/terremark/src/test/resources/terremark/vdc.xml