From e5ab8c23997b942e306513c1f7f7c3290dbe962c Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sun, 9 Jan 2011 12:44:52 -0800 Subject: [PATCH] Issue 440: started to separate vcloud --- allcompute/pom.xml | 13 +--- apis/pom.xml | 1 + {vcloud/core => apis/vcloud}/README.txt | 0 {vcloud/core => apis/vcloud}/pom.xml | 52 +++++++++++-- .../domain/VCloudExpressLoginAsyncClient.java | 0 .../java/domain/VCloudLoginAsyncClient.java | 0 .../domain/VCloudVersionsAsyncClient.java | 0 .../vcloud/CommonVCloudAsyncClient.java | 0 .../jclouds/vcloud/CommonVCloudClient.java | 0 .../org/jclouds/vcloud/VCloudAsyncClient.java | 0 .../java/org/jclouds/vcloud/VCloudClient.java | 0 .../jclouds/vcloud/VCloudContextBuilder.java | 0 .../vcloud/VCloudExpressAsyncClient.java | 0 .../jclouds/vcloud/VCloudExpressClient.java | 0 .../vcloud/VCloudExpressContextBuilder.java | 0 .../vcloud/VCloudExpressMediaType.java | 0 .../VCloudExpressPropertiesBuilder.java | 0 .../org/jclouds/vcloud/VCloudMediaType.java | 0 .../vcloud/VCloudPropertiesBuilder.java | 0 .../vcloud/VCloudResponseException.java | 0 .../java/org/jclouds/vcloud/VCloudToken.java | 0 .../BindCaptureVAppParamsToXmlPayload.java | 0 .../BindCloneVAppParamsToXmlPayload.java | 0 .../BindDeployVAppParamsToXmlPayload.java | 0 ...GuestCustomizationSectionToXmlPayload.java | 0 ...antiateVAppTemplateParamsToXmlPayload.java | 0 ...ExpressVAppTemplateParamsToXmlPayload.java | 0 .../binders/BindParamsToXmlPayload.java | 0 .../BindUndeployVAppParamsToXmlPayload.java | 0 .../compute/CommonVCloudComputeClient.java | 0 .../compute/VCloudExpressComputeClient.java | 0 ...monVCloudBindComputeStrategiesByClass.java | 0 ...mmonVCloudBindComputeSuppliersByClass.java | 0 ...mmonVCloudComputeServiceContextModule.java | 0 .../VCloudBindComputeStrategiesByClass.java | 0 .../VCloudBindComputeSuppliersByClass.java | 0 .../VCloudComputeServiceContextModule.java | 0 ...udExpressBindComputeStrategiesByClass.java | 0 ...oudExpressComputeServiceContextModule.java | 0 .../functions/FindLocationForResource.java | 0 .../compute/functions/HardwareForVApp.java | 0 .../functions/HardwareForVAppTemplate.java | 0 .../HardwareForVCloudExpressVApp.java | 0 .../compute/functions/HardwareInOrg.java | 0 .../functions/ImageForVAppTemplate.java | 0 .../ImageForVCloudExpressVAppTemplate.java | 0 .../vcloud/compute/functions/ImagesInOrg.java | 0 .../functions/ImagesInVCloudExpressOrg.java | 0 .../functions/ImagesInVCloudExpressVDC.java | 0 .../ResourceAllocationsToVolumes.java | 0 .../compute/functions/VAppToNodeMetadata.java | 0 .../VCloudExpressVAppToNodeMetadata.java | 0 .../CommonVCloudComputeClientImpl.java | 0 .../VCloudExpressComputeClientImpl.java | 0 .../internal/VCloudTemplateBuilderImpl.java | 0 .../options/VCloudTemplateOptions.java | 0 ...oginCredentialsFromGuestConfiguration.java | 0 .../VCloudAddNodeWithTagStrategy.java | 0 .../strategy/VCloudDestroyNodeStrategy.java | 0 .../VCloudExpressAddNodeWithTagStrategy.java | 0 .../VCloudExpressDestroyNodeStrategy.java | 0 .../VCloudExpressGetNodeMetadataStrategy.java | 0 .../VCloudExpressLifeCycleStrategy.java | 0 .../VCloudExpressListNodesStrategy.java | 0 .../VCloudGetNodeMetadataStrategy.java | 0 .../strategy/VCloudLifeCycleStrategy.java | 0 .../strategy/VCloudListNodesStrategy.java | 0 .../OrgAndVDCToLocationSupplier.java | 0 .../suppliers/StaticHardwareSupplier.java | 0 .../suppliers/VCloudHardwareSupplier.java | 0 .../suppliers/VCloudImageSupplier.java | 0 .../compute/util/VCloudComputeUtils.java | 0 .../BaseVCloudExpressRestClientModule.java | 0 .../config/BaseVCloudRestClientModule.java | 0 .../config/CommonVCloudRestClientModule.java | 0 .../config/VCloudExpressRestClientModule.java | 0 .../vcloud/config/VCloudRestClientModule.java | 0 .../vcloud/domain/AllocationModel.java | 0 .../org/jclouds/vcloud/domain/Capacity.java | 0 .../org/jclouds/vcloud/domain/Catalog.java | 0 .../jclouds/vcloud/domain/CatalogItem.java | 0 .../domain/GuestCustomizationSection.java | 0 .../domain/InstantiateVAppTemplateParams.java | 0 .../jclouds/vcloud/domain/MappingMode.java | 0 .../vcloud/domain/NetworkConnection.java | 0 .../domain/NetworkConnectionSection.java | 0 .../java/org/jclouds/vcloud/domain/Org.java | 0 .../jclouds/vcloud/domain/ReferenceType.java | 0 .../org/jclouds/vcloud/domain/Status.java | 0 .../java/org/jclouds/vcloud/domain/Task.java | 0 .../org/jclouds/vcloud/domain/TaskStatus.java | 0 .../org/jclouds/vcloud/domain/TasksList.java | 0 .../java/org/jclouds/vcloud/domain/VApp.java | 0 .../jclouds/vcloud/domain/VAppTemplate.java | 0 .../jclouds/vcloud/domain/VCloudError.java | 0 .../vcloud/domain/VCloudExpressVApp.java | 0 .../domain/VCloudExpressVAppTemplate.java | 0 .../jclouds/vcloud/domain/VCloudSession.java | 0 .../java/org/jclouds/vcloud/domain/VDC.java | 0 .../org/jclouds/vcloud/domain/VDCStatus.java | 0 .../java/org/jclouds/vcloud/domain/Vm.java | 0 .../vcloud/domain/internal/CatalogImpl.java | 0 .../domain/internal/CatalogItemImpl.java | 0 .../vcloud/domain/internal/ErrorImpl.java | 0 .../vcloud/domain/internal/OrgImpl.java | 0 .../domain/internal/ReferenceTypeImpl.java | 0 .../vcloud/domain/internal/TaskImpl.java | 0 .../vcloud/domain/internal/TasksListImpl.java | 0 .../vcloud/domain/internal/VAppImpl.java | 0 .../domain/internal/VAppTemplateImpl.java | 0 .../internal/VCloudExpressVAppImpl.java | 0 .../VCloudExpressVAppTemplateImpl.java | 0 .../vcloud/domain/internal/VDCImpl.java | 0 .../vcloud/domain/internal/VmImpl.java | 0 .../vcloud/domain/network/DhcpService.java | 0 .../vcloud/domain/network/Features.java | 0 .../vcloud/domain/network/FenceMode.java | 0 .../domain/network/FirewallService.java | 0 .../network/IpAddressAllocationMode.java | 0 .../vcloud/domain/network/IpRange.java | 0 .../vcloud/domain/network/IpScope.java | 0 .../vcloud/domain/network/NatService.java | 0 .../vcloud/domain/network/NetworkConfig.java | 0 .../vcloud/domain/network/OrgNetwork.java | 0 .../domain/network/VCloudExpressNetwork.java | 0 .../network/firewall/FirewallPolicy.java | 0 .../network/firewall/FirewallProtocols.java | 0 .../domain/network/firewall/FirewallRule.java | 0 .../network/internal/OrgNetworkImpl.java | 0 .../internal/VCloudExpressNetworkImpl.java | 0 .../VCloudExpressOrgNetworkAdapter.java | 0 .../vcloud/domain/network/nat/NatPolicy.java | 0 .../domain/network/nat/NatProtocol.java | 0 .../vcloud/domain/network/nat/NatRule.java | 0 .../vcloud/domain/network/nat/NatType.java | 0 .../network/nat/rules/OneToOneVmRule.java | 0 .../network/nat/rules/PortForwardingRule.java | 0 .../domain/network/nat/rules/VmRule.java | 0 .../ovf/EditableResourceAllocation.java | 0 .../vcloud/domain/ovf/NetworkSection.java | 0 .../domain/ovf/OperatingSystemSection.java | 0 .../vcloud/domain/ovf/OvfEnvelope.java | 0 .../vcloud/domain/ovf/ResourceAllocation.java | 0 .../vcloud/domain/ovf/ResourceType.java | 0 .../org/jclouds/vcloud/domain/ovf/System.java | 0 .../vcloud/domain/ovf/VCloudHardDisk.java | 0 .../domain/ovf/VCloudNetworkAdapter.java | 0 .../domain/ovf/VCloudNetworkSection.java | 0 .../ovf/VCloudOperatingSystemSection.java | 0 .../ovf/VCloudVirtualHardwareSection.java | 0 .../domain/ovf/VirtualHardwareSection.java | 0 .../vcloud/domain/ovf/VirtualSystem.java | 0 .../vcloud/domain/ovf/network/Network.java | 0 .../org/jclouds/vcloud/endpoints/Catalog.java | 0 .../org/jclouds/vcloud/endpoints/Network.java | 0 .../org/jclouds/vcloud/endpoints/Org.java | 0 .../org/jclouds/vcloud/endpoints/OrgList.java | 0 .../jclouds/vcloud/endpoints/TasksList.java | 0 .../jclouds/vcloud/endpoints/VCloudLogin.java | 0 .../org/jclouds/vcloud/endpoints/VDC.java | 0 .../vcloud/filters/SetVCloudTokenCookie.java | 0 .../functions/AllCatalogItemsInCatalog.java | 0 .../functions/AllCatalogItemsInOrg.java | 0 .../vcloud/functions/AllCatalogsInOrg.java | 0 .../vcloud/functions/AllVDCsInOrg.java | 0 .../OrgNameAndCatalogNameToEndpoint.java | 0 .../OrgNameAndVDCNameToEndpoint.java | 0 .../OrgNameCatalogNameItemNameToEndpoint.java | 0 ...CatalogNameVAppTemplateNameToEndpoint.java | 0 .../vcloud/functions/OrgNameToEndpoint.java | 0 .../functions/OrgNameToTasksListEndpoint.java | 0 ...meVDCNameResourceEntityNameToEndpoint.java | 0 .../vcloud/functions/OrgsForLocations.java | 0 .../vcloud/functions/OrgsForNames.java | 0 .../ParseLoginResponseFromHeaders.java | 0 .../VAppTemplatesForCatalogItems.java | 0 ...VCloudExpressAllCatalogItemsInCatalog.java | 0 ...udExpressVAppTemplatesForCatalogItems.java | 0 ...pressVAppTemplatesForResourceEntities.java | 0 .../ParseVCloudErrorFromHttpResponse.java | 0 .../vcloud/options/CaptureVAppOptions.java | 0 .../vcloud/options/CloneVAppOptions.java | 0 .../InstantiateVAppTemplateOptions.java | 0 .../vcloud/predicates/TaskSuccess.java | 0 .../vcloud/predicates/VCloudPredicates.java | 0 .../vcloud/reference/VCloudConstants.java | 0 .../vcloud/reference/package-info.java | 0 .../java/org/jclouds/vcloud/util/Utils.java | 0 .../org/jclouds/vcloud/util/VCloudUtils.java | 0 .../jclouds/vcloud/xml/CatalogHandler.java | 0 .../vcloud/xml/CatalogItemHandler.java | 0 .../org/jclouds/vcloud/xml/ErrorHandler.java | 0 .../xml/GuestCustomizationSectionHandler.java | 0 .../vcloud/xml/NetworkConnectionHandler.java | 0 .../xml/NetworkConnectionSectionHandler.java | 0 .../org/jclouds/vcloud/xml/OrgHandler.java | 0 .../jclouds/vcloud/xml/OrgListHandler.java | 0 ...etworkFromVCloudExpressNetworkHandler.java | 0 .../jclouds/vcloud/xml/OrgNetworkHandler.java | 0 .../vcloud/xml/SupportedVersionsHandler.java | 0 .../org/jclouds/vcloud/xml/TaskHandler.java | 0 .../jclouds/vcloud/xml/TasksListHandler.java | 0 .../org/jclouds/vcloud/xml/VAppHandler.java | 0 .../vcloud/xml/VAppTemplateHandler.java | 0 .../xml/VCloudExpressNetworkHandler.java | 0 .../vcloud/xml/VCloudExpressVAppHandler.java | 0 .../xml/VCloudExpressVAppTemplateHandler.java | 0 .../xml/VCloudVirtualHardwareHandler.java | 0 .../org/jclouds/vcloud/xml/VDCHandler.java | 0 .../xml/VirtualHardwareSectionHandler.java | 0 .../org/jclouds/vcloud/xml/VmHandler.java | 0 .../vcloud/xml/ovf/NetworkSectionHandler.java | 0 .../ovf/OperatingSystemSectionHandler.java | 0 .../vcloud/xml/ovf/OvfEnvelopeHandler.java | 0 .../xml/ovf/ResourceAllocationHandler.java | 0 .../jclouds/vcloud/xml/ovf/SystemHandler.java | 0 .../xml/ovf/VCloudNetworkSectionHandler.java | 0 .../xml/ovf/VCloudOperatingSystemHandler.java | 0 .../ovf/VCloudResourceAllocationHandler.java | 0 .../vcloud/xml/ovf/VirtualSystemHandler.java | 0 .../jclouds/vcloud/CaptureVAppLiveTest.java | 0 .../vcloud/CommonVCloudClientLiveTest.java | 0 .../vcloud/ProvidersInPropertiesTest.java | 0 .../jclouds/vcloud/VCloudAsyncClientTest.java | 0 .../jclouds/vcloud/VCloudClientLiveTest.java | 0 .../vcloud/VCloudExpressAsyncClientTest.java | 0 .../vcloud/VCloudExpressClientLiveTest.java | 0 .../VCloudGuestCustomizationLiveTest.java | 0 .../vcloud/VCloudLoginAsyncClientTest.java | 0 .../vcloud/VCloudVersionsAsyncClientTest.java | 0 .../BindCloneVAppParamsToXmlPayloadTest.java | 0 .../BindDeployVAppParamsToXmlPayloadTest.java | 0 ...ateVAppTemplateParamsToXmlPayloadTest.java | 0 ...essVAppTemplateParamsToXmlPayloadTest.java | 0 ...indUndeployVAppParamsToXmlPayloadTest.java | 0 ...ssBindCloneVAppParamsToXmlPayloadTest.java | 0 .../compute/VCloudComputeServiceLiveTest.java | 0 ...VCloudComputeServiceContextModuleTest.java | 0 ...xpressComputeServiceContextModuleTest.java | 0 .../options/VCloudTemplateOptionsTest.java | 0 .../VCloudExpressOrgNetworkAdapterTest.java | 0 .../filters/SetVCloudTokenCookieTest.java | 0 .../ParseLoginResponseFromHeadersTest.java | 0 .../ParseVCloudErrorFromHttpResponseTest.java | 0 .../InstantiateVAppTemplateOptionsTest.java | 0 .../vcloud/xml/CatalogHandlerTest.java | 0 .../vcloud/xml/CatalogItemHandlerTest.java | 0 .../GuestCustomizationSectionHandlerTest.java | 0 .../xml/NetworkConnectionHandlerTest.java | 0 .../NetworkConnectionSectionHandlerTest.java | 0 .../jclouds/vcloud/xml/OrgHandlerTest.java | 0 .../vcloud/xml/OrgListHandlerTest.java | 0 .../vcloud/xml/OrgNetworkHandlerTest.java | 0 .../xml/SupportedVersionsHandlerTest.java | 0 .../jclouds/vcloud/xml/TaskHandlerTest.java | 0 .../vcloud/xml/TasksListHandlerTest.java | 0 .../jclouds/vcloud/xml/VAppHandlerTest.java | 0 .../vcloud/xml/VAppTemplateHandlerTest.java | 0 .../xml/VCloudExpressNetworkHandlerTest.java | 0 .../VCloudExpressVAppTemplateHandlerTest.java | 0 .../jclouds/vcloud/xml/VDCHandlerTest.java | 0 .../org/jclouds/vcloud/xml/VmHandlerTest.java | 0 .../xml/ovf/OvfEnvelopeHandlerTest.java | 0 .../ovf/ResourceAllocationHandlerTest.java | 0 .../vcloud/xml/ovf/SystemHandlerTest.java | 0 .../xml/ovf/VCloudExpressVAppHandlerTest.java | 0 ...loudOperatingSystemSectionHandlerTest.java | 0 ...loudVirtualHardwareSectionHandlerTest.java | 0 .../xml/ovf/VirtualSystemHandlerTest.java | 0 .../test/resources/captureVApp-default.xml | 0 .../src/test/resources/captureVApp.xml | 0 .../src/test/resources/catalog-blank.xml | 0 .../src/test/resources/catalog-hosting.xml | 0 .../test/resources/catalogItem-hosting.xml | 0 .../test/resources/catalogItem-terremark.xml | 0 .../src/test/resources/cloneVApp-default.xml | 0 .../vcloud}/src/test/resources/cloneVApp.xml | 0 .../src/test/resources/express/catalog.xml | 0 .../resources/express/cloneVApp-default.xml | 0 .../src/test/resources/express/cloneVApp.xml | 0 .../resources/express/network-bluelock.xml | 0 .../resources/express/network-hosting.xml | 0 .../resources/express/network-terremark.xml | 0 .../resources/express/newvapp-cpumemdisk.xml | 0 .../resources/express/newvapp-hosting.xml | 0 .../express/newvapp-hostingcpumemdisk.xml | 0 ...ewvapp-hostingnetworknamedhcpfencemode.xml | 0 .../newvapp-networknamedhcpfencemode.xml | 0 .../src/test/resources/express/newvapp.xml | 0 .../test/resources/express/org-hosting.xml | 0 .../src/test/resources/express/org.xml | 0 .../src/test/resources/express/task-error.xml | 0 .../test/resources/express/task-hosting.xml | 0 .../src/test/resources/express/task-self.xml | 0 .../src/test/resources/express/task.xml | 0 .../express/vAppTemplate-hosting.xml | 0 .../resources/express/vAppTemplate-trmk.xml | 0 .../test/resources/express/vdc-hosting.xml | 0 .../src/test/resources/express/vdc-nonet.xml | 0 .../src/test/resources/express/vdc.xml | 0 .../src/test/resources/guestCustomization.xml | 0 .../resources/guestCustomizationSection.xml | 0 .../src/test/resources/instantiatedvapp.xml | 0 .../instantiationparams-customization.xml | 0 .../resources/instantiationparams-network.xml | 0 .../test/resources/instantiationparams.xml | 0 .../vcloud}/src/test/resources/log4j.xml | 0 .../src/test/resources/networkconnection.xml | 0 .../resources/networkconnectionsection.xml | 0 .../vcloud}/src/test/resources/org.xml | 0 .../vcloud}/src/test/resources/orglist.xml | 0 .../src/test/resources/orgnetwork-bridged.xml | 0 .../test/resources/orgnetwork-isolated.xml | 0 .../vcloud}/src/test/resources/os.xml | 0 .../vcloud}/src/test/resources/ovf.xml | 0 .../resources/resourceallocation-hosting.xml | 0 .../vcloud}/src/test/resources/task.xml | 0 .../src/test/resources/taskslist-hosting.xml | 0 .../vcloud}/src/test/resources/taskslist.xml | 0 .../test/resources/vAppTemplate-copying.xml | 0 .../src/test/resources/vAppTemplate.xml | 0 .../src/test/resources/vapp-hosting.xml | 0 .../test/resources/vapp-rhel-off-static.xml | 0 .../test/resources/vapp-ubuntu-off-dhcp.xml | 0 .../src/test/resources/vapp-unresolved.xml | 0 .../test/resources/vapp-win-off-static.xml | 0 .../vcloud}/src/test/resources/vapp.xml | 0 .../vcloud}/src/test/resources/vapp2.xml | 0 .../vcloud}/src/test/resources/vdc.xml | 0 .../vcloud}/src/test/resources/versions.xml | 0 .../test/resources/virtualhardwaresection.xml | 0 .../test/resources/virtualsystem-hosting.xml | 0 .../src/test/resources/virtualsystem.xml | 0 .../src/test/resources/vm-rhel-off-static.xml | 0 pom.xml | 1 - .../bluelock-vcdirector}/README.txt | 0 .../bluelock-vcdirector}/pom.xml | 74 +++++++++++++------ .../BlueLockVCloudDirectorContextBuilder.java | 0 ...ueLockVCloudDirectorPropertiesBuilder.java | 0 ...lueLockVCloudDirectorRestClientModule.java | 0 .../BlueLockVCloudDirectorClientLiveTest.java | 0 ...oudDirectorGuestCustomizationLiveTest.java | 0 .../bluelock/ProvidersInPropertiesTest.java | 0 .../VCloudSessionRefreshLiveTest.java | 0 ...kVCloudDirectorComputeServiceLiveTest.java | 0 .../src/test/resources/bluelock/vdc.xml | 0 .../src/test/resources/log4j.xml | 0 providers/pom.xml | 1 + 348 files changed, 102 insertions(+), 40 deletions(-) rename {vcloud/core => apis/vcloud}/README.txt (100%) rename {vcloud/core => apis/vcloud}/pom.xml (72%) rename {vcloud/core => apis/vcloud}/src/main/java/domain/VCloudExpressLoginAsyncClient.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/domain/VCloudLoginAsyncClient.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/domain/VCloudVersionsAsyncClient.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/CommonVCloudAsyncClient.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/CommonVCloudClient.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/VCloudClient.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/VCloudContextBuilder.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/VCloudExpressAsyncClient.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/VCloudExpressClient.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/VCloudExpressContextBuilder.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/VCloudExpressMediaType.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/VCloudExpressPropertiesBuilder.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/VCloudMediaType.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/VCloudPropertiesBuilder.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/VCloudResponseException.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/VCloudToken.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/binders/BindCaptureVAppParamsToXmlPayload.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayload.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/binders/BindDeployVAppParamsToXmlPayload.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/binders/BindGuestCustomizationSectionToXmlPayload.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayload.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/binders/BindParamsToXmlPayload.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/binders/BindUndeployVAppParamsToXmlPayload.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/CommonVCloudComputeClient.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/VCloudExpressComputeClient.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/config/CommonVCloudBindComputeStrategiesByClass.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/config/CommonVCloudBindComputeSuppliersByClass.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/config/CommonVCloudComputeServiceContextModule.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/config/VCloudBindComputeStrategiesByClass.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/config/VCloudBindComputeSuppliersByClass.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModule.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressBindComputeStrategiesByClass.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModule.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/functions/FindLocationForResource.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVApp.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVAppTemplate.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVCloudExpressVApp.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/functions/HardwareInOrg.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVAppTemplate.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVCloudExpressVAppTemplate.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInOrg.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressOrg.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressVDC.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/functions/ResourceAllocationsToVolumes.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/functions/VAppToNodeMetadata.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/functions/VCloudExpressVAppToNodeMetadata.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/internal/CommonVCloudComputeClientImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/internal/VCloudExpressComputeClientImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/internal/VCloudTemplateBuilderImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptions.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/strategy/GetLoginCredentialsFromGuestConfiguration.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudAddNodeWithTagStrategy.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudDestroyNodeStrategy.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressAddNodeWithTagStrategy.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressDestroyNodeStrategy.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressGetNodeMetadataStrategy.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressLifeCycleStrategy.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressListNodesStrategy.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudGetNodeMetadataStrategy.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudLifeCycleStrategy.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudListNodesStrategy.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/suppliers/OrgAndVDCToLocationSupplier.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/suppliers/StaticHardwareSupplier.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/suppliers/VCloudHardwareSupplier.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/suppliers/VCloudImageSupplier.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/compute/util/VCloudComputeUtils.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/config/BaseVCloudExpressRestClientModule.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/config/BaseVCloudRestClientModule.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/config/CommonVCloudRestClientModule.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/config/VCloudExpressRestClientModule.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/AllocationModel.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/Capacity.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/Catalog.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/CatalogItem.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/GuestCustomizationSection.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/InstantiateVAppTemplateParams.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/MappingMode.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/NetworkConnection.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/NetworkConnectionSection.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/Org.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/ReferenceType.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/Status.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/Task.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/TaskStatus.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/TasksList.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/VApp.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/VAppTemplate.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/VCloudError.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVApp.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVAppTemplate.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/VCloudSession.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/VDC.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/VDCStatus.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/Vm.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/internal/CatalogItemImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/internal/ErrorImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/internal/OrgImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/internal/TasksListImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/internal/VAppTemplateImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppTemplateImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/internal/VDCImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/internal/VmImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/Features.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/FenceMode.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/IpAddressAllocationMode.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/IpRange.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/NatService.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/NetworkConfig.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/OrgNetwork.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/VCloudExpressNetwork.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallPolicy.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallProtocols.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressNetworkImpl.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapter.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/nat/NatPolicy.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/nat/NatProtocol.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/nat/NatRule.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/nat/NatType.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/PortForwardingRule.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/ovf/EditableResourceAllocation.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/ovf/NetworkSection.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/ovf/OperatingSystemSection.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/ovf/OvfEnvelope.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/ovf/ResourceAllocation.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/ovf/ResourceType.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/ovf/System.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudHardDisk.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudNetworkAdapter.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudNetworkSection.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudOperatingSystemSection.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudVirtualHardwareSection.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/ovf/VirtualHardwareSection.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/ovf/VirtualSystem.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/domain/ovf/network/Network.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/endpoints/Catalog.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/endpoints/Network.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/endpoints/Org.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/endpoints/OrgList.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/endpoints/TasksList.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/endpoints/VCloudLogin.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/endpoints/VDC.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/filters/SetVCloudTokenCookie.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/AllCatalogItemsInCatalog.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/AllCatalogItemsInOrg.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/AllCatalogsInOrg.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/AllVDCsInOrg.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/OrgNameAndCatalogNameToEndpoint.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/OrgNameAndVDCNameToEndpoint.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/OrgNameCatalogNameItemNameToEndpoint.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/OrgNameCatalogNameVAppTemplateNameToEndpoint.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/OrgNameToEndpoint.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/OrgNameToTasksListEndpoint.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/OrgNameVDCNameResourceEntityNameToEndpoint.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/OrgsForLocations.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/OrgsForNames.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeaders.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/VAppTemplatesForCatalogItems.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/VCloudExpressAllCatalogItemsInCatalog.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForCatalogItems.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForResourceEntities.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/handlers/ParseVCloudErrorFromHttpResponse.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/options/CaptureVAppOptions.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/predicates/TaskSuccess.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/predicates/VCloudPredicates.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/reference/VCloudConstants.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/reference/package-info.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/util/Utils.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/util/VCloudUtils.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/CatalogHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/CatalogItemHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/ErrorHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/GuestCustomizationSectionHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/NetworkConnectionHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/NetworkConnectionSectionHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/OrgHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/OrgListHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/OrgNetworkFromVCloudExpressNetworkHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/OrgNetworkHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/SupportedVersionsHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/TaskHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/TasksListHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/VAppHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/VAppTemplateHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/VCloudVirtualHardwareHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/VDCHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/VirtualHardwareSectionHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/VmHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/ovf/NetworkSectionHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/ovf/OperatingSystemSectionHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/ovf/OvfEnvelopeHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/ovf/ResourceAllocationHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/ovf/SystemHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudNetworkSectionHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudResourceAllocationHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/main/java/org/jclouds/vcloud/xml/ovf/VirtualSystemHandler.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/CaptureVAppLiveTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/CommonVCloudClientLiveTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/ProvidersInPropertiesTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/VCloudAsyncClientTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/VCloudClientLiveTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/VCloudExpressClientLiveTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/VCloudGuestCustomizationLiveTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/VCloudLoginAsyncClientTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/VCloudVersionsAsyncClientTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayloadTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/binders/BindDeployVAppParamsToXmlPayloadTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayloadTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayloadTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/binders/BindUndeployVAppParamsToXmlPayloadTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/binders/VCloudExpressBindCloneVAppParamsToXmlPayloadTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModuleTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModuleTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptionsTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapterTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/filters/SetVCloudTokenCookieTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeadersTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/handlers/ParseVCloudErrorFromHttpResponseTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptionsTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/CatalogHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/CatalogItemHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/GuestCustomizationSectionHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/NetworkConnectionHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/NetworkConnectionSectionHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/OrgHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/OrgListHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/OrgNetworkHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/SupportedVersionsHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/TaskHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/TasksListHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/VAppHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/VAppTemplateHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/VDCHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/VmHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/ovf/OvfEnvelopeHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/ovf/ResourceAllocationHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/ovf/SystemHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudExpressVAppHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemSectionHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/java/org/jclouds/vcloud/xml/ovf/VirtualSystemHandlerTest.java (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/captureVApp-default.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/captureVApp.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/catalog-blank.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/catalog-hosting.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/catalogItem-hosting.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/catalogItem-terremark.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/cloneVApp-default.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/cloneVApp.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/catalog.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/cloneVApp-default.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/cloneVApp.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/network-bluelock.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/network-hosting.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/network-terremark.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/newvapp-cpumemdisk.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/newvapp-hosting.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/newvapp-hostingcpumemdisk.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/newvapp-hostingnetworknamedhcpfencemode.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/newvapp-networknamedhcpfencemode.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/newvapp.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/org-hosting.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/org.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/task-error.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/task-hosting.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/task-self.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/task.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/vAppTemplate-hosting.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/vAppTemplate-trmk.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/vdc-hosting.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/vdc-nonet.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/express/vdc.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/guestCustomization.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/guestCustomizationSection.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/instantiatedvapp.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/instantiationparams-customization.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/instantiationparams-network.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/instantiationparams.xml (100%) rename {vcloud/bluelock => apis/vcloud}/src/test/resources/log4j.xml (100%) mode change 100644 => 100755 rename {vcloud/core => apis/vcloud}/src/test/resources/networkconnection.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/networkconnectionsection.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/org.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/orglist.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/orgnetwork-bridged.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/orgnetwork-isolated.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/os.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/ovf.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/resourceallocation-hosting.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/task.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/taskslist-hosting.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/taskslist.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/vAppTemplate-copying.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/vAppTemplate.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/vapp-hosting.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/vapp-rhel-off-static.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/vapp-ubuntu-off-dhcp.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/vapp-unresolved.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/vapp-win-off-static.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/vapp.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/vapp2.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/vdc.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/versions.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/virtualhardwaresection.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/virtualsystem-hosting.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/virtualsystem.xml (100%) rename {vcloud/core => apis/vcloud}/src/test/resources/vm-rhel-off-static.xml (100%) rename {vcloud/bluelock => providers/bluelock-vcdirector}/README.txt (100%) rename {vcloud/bluelock => providers/bluelock-vcdirector}/pom.xml (65%) rename {vcloud/bluelock => providers/bluelock-vcdirector}/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorContextBuilder.java (100%) rename {vcloud/bluelock => providers/bluelock-vcdirector}/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorPropertiesBuilder.java (100%) rename {vcloud/bluelock => providers/bluelock-vcdirector}/src/main/java/org/jclouds/vcloud/bluelock/config/BlueLockVCloudDirectorRestClientModule.java (100%) rename {vcloud/bluelock => providers/bluelock-vcdirector}/src/test/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorClientLiveTest.java (100%) rename {vcloud/bluelock => providers/bluelock-vcdirector}/src/test/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorGuestCustomizationLiveTest.java (100%) rename {vcloud/bluelock => providers/bluelock-vcdirector}/src/test/java/org/jclouds/vcloud/bluelock/ProvidersInPropertiesTest.java (100%) rename {vcloud/bluelock => providers/bluelock-vcdirector}/src/test/java/org/jclouds/vcloud/bluelock/VCloudSessionRefreshLiveTest.java (100%) rename {vcloud/bluelock => providers/bluelock-vcdirector}/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java (100%) rename {vcloud/bluelock => providers/bluelock-vcdirector}/src/test/resources/bluelock/vdc.xml (100%) rename {vcloud/core => providers/bluelock-vcdirector}/src/test/resources/log4j.xml (100%) mode change 100755 => 100644 diff --git a/allcompute/pom.xml b/allcompute/pom.xml index e30aa8d0a7..19f9652df6 100644 --- a/allcompute/pom.xml +++ b/allcompute/pom.xml @@ -60,18 +60,13 @@ ${project.version} - ${project.groupId} - jclouds-vcloud + org.jclouds.api + vcloud ${project.version} - ${project.groupId} - jclouds-bluelock - ${project.version} - - - ${project.groupId} - jclouds-terremark + org.jclouds.provider + bluelock-vcdirector ${project.version} diff --git a/apis/pom.xml b/apis/pom.xml index 4ba3ab8d59..6fd1c3f99b 100644 --- a/apis/pom.xml +++ b/apis/pom.xml @@ -42,5 +42,6 @@ swift cloudfiles cloudservers + vcloud diff --git a/vcloud/core/README.txt b/apis/vcloud/README.txt similarity index 100% rename from vcloud/core/README.txt rename to apis/vcloud/README.txt diff --git a/vcloud/core/pom.xml b/apis/vcloud/pom.xml similarity index 72% rename from vcloud/core/pom.xml rename to apis/vcloud/pom.xml index 2a2b87a308..a88900e88a 100644 --- a/vcloud/core/pom.xml +++ b/apis/vcloud/pom.xml @@ -24,16 +24,19 @@ 4.0.0 org.jclouds - jclouds-vcloud-project + jclouds-project 1.0-SNAPSHOT + ../../project/pom.xml - jclouds-vcloud - jclouds vcloud Components Core - jclouds Core components to access vcloud + org.jclouds.api + vcloud + jcloud vcloud api + jclouds components to access an implementation of VMWare vCloud + trmkrun-ccc,test.trmk-924 - https://66.45.200.97/api + FIXME 1.0 FIXME FIXME @@ -45,13 +48,50 @@ + + org.jclouds + jclouds-core + ${project.version} + test-jar + test + + + org.jclouds + jclouds-compute + ${project.version} + + + org.jclouds + jclouds-compute + ${project.version} + test-jar + test + + + org.jclouds + jclouds-jsch + ${project.version} + test + + + log4j + log4j + 1.2.14 + test + + + org.jclouds + jclouds-log4j + ${project.version} + test + com.jamesmurty.utils java-xmlbuilder 0.3 - ${project.groupId} + org.jclouds jclouds-core ${project.version} diff --git a/vcloud/core/src/main/java/domain/VCloudExpressLoginAsyncClient.java b/apis/vcloud/src/main/java/domain/VCloudExpressLoginAsyncClient.java similarity index 100% rename from vcloud/core/src/main/java/domain/VCloudExpressLoginAsyncClient.java rename to apis/vcloud/src/main/java/domain/VCloudExpressLoginAsyncClient.java diff --git a/vcloud/core/src/main/java/domain/VCloudLoginAsyncClient.java b/apis/vcloud/src/main/java/domain/VCloudLoginAsyncClient.java similarity index 100% rename from vcloud/core/src/main/java/domain/VCloudLoginAsyncClient.java rename to apis/vcloud/src/main/java/domain/VCloudLoginAsyncClient.java diff --git a/vcloud/core/src/main/java/domain/VCloudVersionsAsyncClient.java b/apis/vcloud/src/main/java/domain/VCloudVersionsAsyncClient.java similarity index 100% rename from vcloud/core/src/main/java/domain/VCloudVersionsAsyncClient.java rename to apis/vcloud/src/main/java/domain/VCloudVersionsAsyncClient.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/CommonVCloudAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/CommonVCloudAsyncClient.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/CommonVCloudAsyncClient.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/CommonVCloudAsyncClient.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/CommonVCloudClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/CommonVCloudClient.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/CommonVCloudClient.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/CommonVCloudClient.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudClient.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/VCloudClient.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudClient.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudContextBuilder.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudContextBuilder.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/VCloudContextBuilder.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudContextBuilder.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudExpressAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudExpressAsyncClient.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/VCloudExpressAsyncClient.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudExpressAsyncClient.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudExpressClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudExpressClient.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/VCloudExpressClient.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudExpressClient.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudExpressContextBuilder.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudExpressContextBuilder.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/VCloudExpressContextBuilder.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudExpressContextBuilder.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudExpressMediaType.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudExpressMediaType.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/VCloudExpressMediaType.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudExpressMediaType.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudExpressPropertiesBuilder.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudExpressPropertiesBuilder.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/VCloudExpressPropertiesBuilder.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudExpressPropertiesBuilder.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudMediaType.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudMediaType.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/VCloudMediaType.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudMediaType.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudPropertiesBuilder.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudPropertiesBuilder.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/VCloudPropertiesBuilder.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudPropertiesBuilder.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudResponseException.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudResponseException.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/VCloudResponseException.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudResponseException.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudToken.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudToken.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/VCloudToken.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudToken.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/binders/BindCaptureVAppParamsToXmlPayload.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindCaptureVAppParamsToXmlPayload.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/binders/BindCaptureVAppParamsToXmlPayload.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindCaptureVAppParamsToXmlPayload.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayload.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayload.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayload.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayload.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/binders/BindDeployVAppParamsToXmlPayload.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindDeployVAppParamsToXmlPayload.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/binders/BindDeployVAppParamsToXmlPayload.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindDeployVAppParamsToXmlPayload.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/binders/BindGuestCustomizationSectionToXmlPayload.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindGuestCustomizationSectionToXmlPayload.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/binders/BindGuestCustomizationSectionToXmlPayload.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindGuestCustomizationSectionToXmlPayload.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayload.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayload.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayload.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayload.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/binders/BindParamsToXmlPayload.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindParamsToXmlPayload.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/binders/BindParamsToXmlPayload.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindParamsToXmlPayload.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/binders/BindUndeployVAppParamsToXmlPayload.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindUndeployVAppParamsToXmlPayload.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/binders/BindUndeployVAppParamsToXmlPayload.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindUndeployVAppParamsToXmlPayload.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/CommonVCloudComputeClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/CommonVCloudComputeClient.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/CommonVCloudComputeClient.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/CommonVCloudComputeClient.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/VCloudExpressComputeClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/VCloudExpressComputeClient.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/VCloudExpressComputeClient.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/VCloudExpressComputeClient.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/CommonVCloudBindComputeStrategiesByClass.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/config/CommonVCloudBindComputeStrategiesByClass.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/CommonVCloudBindComputeStrategiesByClass.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/config/CommonVCloudBindComputeStrategiesByClass.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/CommonVCloudBindComputeSuppliersByClass.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/config/CommonVCloudBindComputeSuppliersByClass.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/CommonVCloudBindComputeSuppliersByClass.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/config/CommonVCloudBindComputeSuppliersByClass.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/CommonVCloudComputeServiceContextModule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/config/CommonVCloudComputeServiceContextModule.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/CommonVCloudComputeServiceContextModule.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/config/CommonVCloudComputeServiceContextModule.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/VCloudBindComputeStrategiesByClass.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/config/VCloudBindComputeStrategiesByClass.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/VCloudBindComputeStrategiesByClass.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/config/VCloudBindComputeStrategiesByClass.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/VCloudBindComputeSuppliersByClass.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/config/VCloudBindComputeSuppliersByClass.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/VCloudBindComputeSuppliersByClass.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/config/VCloudBindComputeSuppliersByClass.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModule.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModule.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModule.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressBindComputeStrategiesByClass.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressBindComputeStrategiesByClass.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressBindComputeStrategiesByClass.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressBindComputeStrategiesByClass.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModule.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModule.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModule.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/FindLocationForResource.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/FindLocationForResource.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/FindLocationForResource.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/FindLocationForResource.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVApp.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVApp.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVApp.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVApp.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVAppTemplate.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVAppTemplate.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVAppTemplate.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVAppTemplate.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVCloudExpressVApp.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVCloudExpressVApp.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVCloudExpressVApp.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVCloudExpressVApp.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareInOrg.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/HardwareInOrg.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareInOrg.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/HardwareInOrg.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVAppTemplate.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVAppTemplate.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVAppTemplate.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVAppTemplate.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVCloudExpressVAppTemplate.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVCloudExpressVAppTemplate.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVCloudExpressVAppTemplate.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVCloudExpressVAppTemplate.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInOrg.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInOrg.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInOrg.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInOrg.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressOrg.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressOrg.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressOrg.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressOrg.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressVDC.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressVDC.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressVDC.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressVDC.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ResourceAllocationsToVolumes.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ResourceAllocationsToVolumes.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ResourceAllocationsToVolumes.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/ResourceAllocationsToVolumes.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/VAppToNodeMetadata.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/VAppToNodeMetadata.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/VAppToNodeMetadata.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/VAppToNodeMetadata.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/VCloudExpressVAppToNodeMetadata.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/VCloudExpressVAppToNodeMetadata.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/VCloudExpressVAppToNodeMetadata.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/VCloudExpressVAppToNodeMetadata.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/internal/CommonVCloudComputeClientImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/internal/CommonVCloudComputeClientImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/internal/CommonVCloudComputeClientImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/internal/CommonVCloudComputeClientImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/internal/VCloudExpressComputeClientImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/internal/VCloudExpressComputeClientImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/internal/VCloudExpressComputeClientImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/internal/VCloudExpressComputeClientImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/internal/VCloudTemplateBuilderImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/internal/VCloudTemplateBuilderImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/internal/VCloudTemplateBuilderImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/internal/VCloudTemplateBuilderImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptions.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptions.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptions.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptions.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/GetLoginCredentialsFromGuestConfiguration.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/GetLoginCredentialsFromGuestConfiguration.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/GetLoginCredentialsFromGuestConfiguration.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/GetLoginCredentialsFromGuestConfiguration.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudAddNodeWithTagStrategy.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudAddNodeWithTagStrategy.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudAddNodeWithTagStrategy.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudAddNodeWithTagStrategy.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudDestroyNodeStrategy.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudDestroyNodeStrategy.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudDestroyNodeStrategy.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudDestroyNodeStrategy.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressAddNodeWithTagStrategy.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressAddNodeWithTagStrategy.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressAddNodeWithTagStrategy.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressAddNodeWithTagStrategy.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressDestroyNodeStrategy.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressDestroyNodeStrategy.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressDestroyNodeStrategy.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressDestroyNodeStrategy.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressGetNodeMetadataStrategy.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressGetNodeMetadataStrategy.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressGetNodeMetadataStrategy.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressGetNodeMetadataStrategy.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressLifeCycleStrategy.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressLifeCycleStrategy.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressLifeCycleStrategy.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressLifeCycleStrategy.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressListNodesStrategy.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressListNodesStrategy.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressListNodesStrategy.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressListNodesStrategy.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudGetNodeMetadataStrategy.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudGetNodeMetadataStrategy.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudGetNodeMetadataStrategy.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudGetNodeMetadataStrategy.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudLifeCycleStrategy.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudLifeCycleStrategy.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudLifeCycleStrategy.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudLifeCycleStrategy.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudListNodesStrategy.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudListNodesStrategy.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudListNodesStrategy.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudListNodesStrategy.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/suppliers/OrgAndVDCToLocationSupplier.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/suppliers/OrgAndVDCToLocationSupplier.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/suppliers/OrgAndVDCToLocationSupplier.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/suppliers/OrgAndVDCToLocationSupplier.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/suppliers/StaticHardwareSupplier.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/suppliers/StaticHardwareSupplier.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/suppliers/StaticHardwareSupplier.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/suppliers/StaticHardwareSupplier.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/suppliers/VCloudHardwareSupplier.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/suppliers/VCloudHardwareSupplier.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/suppliers/VCloudHardwareSupplier.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/suppliers/VCloudHardwareSupplier.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/suppliers/VCloudImageSupplier.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/suppliers/VCloudImageSupplier.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/suppliers/VCloudImageSupplier.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/suppliers/VCloudImageSupplier.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/util/VCloudComputeUtils.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/util/VCloudComputeUtils.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/compute/util/VCloudComputeUtils.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/compute/util/VCloudComputeUtils.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/config/BaseVCloudExpressRestClientModule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/BaseVCloudExpressRestClientModule.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/config/BaseVCloudExpressRestClientModule.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/config/BaseVCloudExpressRestClientModule.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/config/BaseVCloudRestClientModule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/BaseVCloudRestClientModule.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/config/BaseVCloudRestClientModule.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/config/BaseVCloudRestClientModule.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/config/CommonVCloudRestClientModule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/CommonVCloudRestClientModule.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/config/CommonVCloudRestClientModule.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/config/CommonVCloudRestClientModule.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/config/VCloudExpressRestClientModule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudExpressRestClientModule.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/config/VCloudExpressRestClientModule.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudExpressRestClientModule.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/AllocationModel.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/AllocationModel.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/AllocationModel.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/AllocationModel.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/Capacity.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Capacity.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/Capacity.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Capacity.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/Catalog.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Catalog.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/Catalog.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Catalog.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/CatalogItem.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/CatalogItem.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/CatalogItem.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/CatalogItem.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/GuestCustomizationSection.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/GuestCustomizationSection.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/GuestCustomizationSection.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/GuestCustomizationSection.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/InstantiateVAppTemplateParams.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/InstantiateVAppTemplateParams.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/InstantiateVAppTemplateParams.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/InstantiateVAppTemplateParams.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/MappingMode.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/MappingMode.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/MappingMode.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/MappingMode.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/NetworkConnection.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/NetworkConnection.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/NetworkConnection.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/NetworkConnection.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/NetworkConnectionSection.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/NetworkConnectionSection.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/NetworkConnectionSection.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/NetworkConnectionSection.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/Org.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Org.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/Org.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Org.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/ReferenceType.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ReferenceType.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/ReferenceType.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ReferenceType.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/Status.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Status.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/Status.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Status.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/Task.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Task.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/Task.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Task.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/TaskStatus.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/TaskStatus.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/TaskStatus.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/TaskStatus.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/TasksList.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/TasksList.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/TasksList.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/TasksList.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/VApp.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VApp.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/VApp.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VApp.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/VAppTemplate.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VAppTemplate.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/VAppTemplate.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VAppTemplate.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/VCloudError.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VCloudError.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/VCloudError.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VCloudError.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVApp.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVApp.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVApp.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVApp.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVAppTemplate.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVAppTemplate.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVAppTemplate.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVAppTemplate.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/VCloudSession.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VCloudSession.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/VCloudSession.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VCloudSession.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/VDC.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VDC.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/VDC.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VDC.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/VDCStatus.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VDCStatus.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/VDCStatus.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VDCStatus.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/Vm.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Vm.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/Vm.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Vm.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/CatalogItemImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogItemImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/CatalogItemImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogItemImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/ErrorImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ErrorImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/ErrorImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ErrorImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/OrgImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/OrgImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/OrgImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/OrgImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/TasksListImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TasksListImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/TasksListImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TasksListImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/VAppTemplateImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppTemplateImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/VAppTemplateImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppTemplateImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppTemplateImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppTemplateImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppTemplateImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppTemplateImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/VDCImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VDCImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/VDCImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VDCImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/VmImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VmImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/internal/VmImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VmImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/Features.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/Features.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/FenceMode.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FenceMode.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/FenceMode.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FenceMode.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/IpAddressAllocationMode.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpAddressAllocationMode.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/IpAddressAllocationMode.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpAddressAllocationMode.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/IpRange.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpRange.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/IpRange.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpRange.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/NatService.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/NatService.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/NetworkConfig.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NetworkConfig.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/NetworkConfig.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NetworkConfig.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/OrgNetwork.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/OrgNetwork.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/OrgNetwork.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/OrgNetwork.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/VCloudExpressNetwork.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/VCloudExpressNetwork.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/VCloudExpressNetwork.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/VCloudExpressNetwork.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallPolicy.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallPolicy.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallPolicy.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallPolicy.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallProtocols.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallProtocols.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallProtocols.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallProtocols.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressNetworkImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressNetworkImpl.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressNetworkImpl.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressNetworkImpl.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapter.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapter.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapter.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapter.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/nat/NatPolicy.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/NatPolicy.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/nat/NatPolicy.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/NatPolicy.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/nat/NatProtocol.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/NatProtocol.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/nat/NatProtocol.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/NatProtocol.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/nat/NatRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/NatRule.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/nat/NatRule.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/NatRule.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/nat/NatType.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/NatType.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/nat/NatType.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/NatType.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/PortForwardingRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/PortForwardingRule.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/PortForwardingRule.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/PortForwardingRule.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/EditableResourceAllocation.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/EditableResourceAllocation.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/EditableResourceAllocation.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/EditableResourceAllocation.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/NetworkSection.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/NetworkSection.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/NetworkSection.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/NetworkSection.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/OperatingSystemSection.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/OperatingSystemSection.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/OperatingSystemSection.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/OperatingSystemSection.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/OvfEnvelope.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/OvfEnvelope.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/OvfEnvelope.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/OvfEnvelope.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/ResourceAllocation.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/ResourceAllocation.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/ResourceAllocation.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/ResourceAllocation.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/ResourceType.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/ResourceType.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/ResourceType.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/ResourceType.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/System.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/System.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/System.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/System.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudHardDisk.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudHardDisk.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudHardDisk.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudHardDisk.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudNetworkAdapter.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudNetworkAdapter.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudNetworkAdapter.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudNetworkAdapter.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudNetworkSection.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudNetworkSection.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudNetworkSection.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudNetworkSection.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudOperatingSystemSection.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudOperatingSystemSection.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudOperatingSystemSection.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudOperatingSystemSection.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudVirtualHardwareSection.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudVirtualHardwareSection.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudVirtualHardwareSection.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudVirtualHardwareSection.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/VirtualHardwareSection.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VirtualHardwareSection.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/VirtualHardwareSection.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VirtualHardwareSection.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/VirtualSystem.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VirtualSystem.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/VirtualSystem.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VirtualSystem.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/network/Network.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/network/Network.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/domain/ovf/network/Network.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/network/Network.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/endpoints/Catalog.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/endpoints/Catalog.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/endpoints/Catalog.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/endpoints/Catalog.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/endpoints/Network.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/endpoints/Network.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/endpoints/Network.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/endpoints/Network.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/endpoints/Org.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/endpoints/Org.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/endpoints/Org.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/endpoints/Org.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/endpoints/OrgList.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/endpoints/OrgList.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/endpoints/OrgList.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/endpoints/OrgList.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/endpoints/TasksList.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/endpoints/TasksList.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/endpoints/TasksList.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/endpoints/TasksList.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/endpoints/VCloudLogin.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/endpoints/VCloudLogin.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/endpoints/VCloudLogin.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/endpoints/VCloudLogin.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/endpoints/VDC.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/endpoints/VDC.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/endpoints/VDC.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/endpoints/VDC.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/filters/SetVCloudTokenCookie.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/filters/SetVCloudTokenCookie.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/filters/SetVCloudTokenCookie.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/filters/SetVCloudTokenCookie.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/AllCatalogItemsInCatalog.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/AllCatalogItemsInCatalog.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/AllCatalogItemsInCatalog.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/AllCatalogItemsInCatalog.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/AllCatalogItemsInOrg.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/AllCatalogItemsInOrg.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/AllCatalogItemsInOrg.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/AllCatalogItemsInOrg.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/AllCatalogsInOrg.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/AllCatalogsInOrg.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/AllCatalogsInOrg.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/AllCatalogsInOrg.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/AllVDCsInOrg.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/AllVDCsInOrg.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/AllVDCsInOrg.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/AllVDCsInOrg.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgNameAndCatalogNameToEndpoint.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameAndCatalogNameToEndpoint.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgNameAndCatalogNameToEndpoint.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameAndCatalogNameToEndpoint.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgNameAndVDCNameToEndpoint.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameAndVDCNameToEndpoint.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgNameAndVDCNameToEndpoint.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameAndVDCNameToEndpoint.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgNameCatalogNameItemNameToEndpoint.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameCatalogNameItemNameToEndpoint.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgNameCatalogNameItemNameToEndpoint.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameCatalogNameItemNameToEndpoint.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgNameCatalogNameVAppTemplateNameToEndpoint.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameCatalogNameVAppTemplateNameToEndpoint.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgNameCatalogNameVAppTemplateNameToEndpoint.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameCatalogNameVAppTemplateNameToEndpoint.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgNameToEndpoint.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameToEndpoint.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgNameToEndpoint.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameToEndpoint.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgNameToTasksListEndpoint.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameToTasksListEndpoint.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgNameToTasksListEndpoint.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameToTasksListEndpoint.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgNameVDCNameResourceEntityNameToEndpoint.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameVDCNameResourceEntityNameToEndpoint.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgNameVDCNameResourceEntityNameToEndpoint.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameVDCNameResourceEntityNameToEndpoint.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgsForLocations.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgsForLocations.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgsForLocations.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgsForLocations.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgsForNames.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgsForNames.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/OrgsForNames.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgsForNames.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeaders.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeaders.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeaders.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeaders.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/VAppTemplatesForCatalogItems.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/VAppTemplatesForCatalogItems.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/VAppTemplatesForCatalogItems.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/VAppTemplatesForCatalogItems.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/VCloudExpressAllCatalogItemsInCatalog.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/VCloudExpressAllCatalogItemsInCatalog.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/VCloudExpressAllCatalogItemsInCatalog.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/VCloudExpressAllCatalogItemsInCatalog.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForCatalogItems.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForCatalogItems.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForCatalogItems.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForCatalogItems.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForResourceEntities.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForResourceEntities.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForResourceEntities.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForResourceEntities.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/handlers/ParseVCloudErrorFromHttpResponse.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/handlers/ParseVCloudErrorFromHttpResponse.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/handlers/ParseVCloudErrorFromHttpResponse.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/handlers/ParseVCloudErrorFromHttpResponse.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/options/CaptureVAppOptions.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CaptureVAppOptions.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/options/CaptureVAppOptions.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/options/CaptureVAppOptions.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/predicates/TaskSuccess.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/predicates/TaskSuccess.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/predicates/TaskSuccess.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/predicates/TaskSuccess.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/predicates/VCloudPredicates.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/predicates/VCloudPredicates.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/predicates/VCloudPredicates.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/predicates/VCloudPredicates.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/reference/VCloudConstants.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/reference/VCloudConstants.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/reference/VCloudConstants.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/reference/VCloudConstants.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/reference/package-info.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/reference/package-info.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/reference/package-info.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/reference/package-info.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/util/Utils.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/util/Utils.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/util/Utils.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/util/Utils.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/util/VCloudUtils.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/util/VCloudUtils.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/util/VCloudUtils.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/util/VCloudUtils.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/CatalogHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/CatalogHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/CatalogHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/CatalogHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/CatalogItemHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/CatalogItemHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/CatalogItemHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/CatalogItemHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/ErrorHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ErrorHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/ErrorHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ErrorHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/GuestCustomizationSectionHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/GuestCustomizationSectionHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/GuestCustomizationSectionHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/GuestCustomizationSectionHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/NetworkConnectionHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/NetworkConnectionHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/NetworkConnectionHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/NetworkConnectionHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/NetworkConnectionSectionHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/NetworkConnectionSectionHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/NetworkConnectionSectionHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/NetworkConnectionSectionHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/OrgHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/OrgHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/OrgHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/OrgHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/OrgListHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/OrgListHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/OrgListHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/OrgListHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/OrgNetworkFromVCloudExpressNetworkHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/OrgNetworkFromVCloudExpressNetworkHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/OrgNetworkFromVCloudExpressNetworkHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/OrgNetworkFromVCloudExpressNetworkHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/OrgNetworkHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/OrgNetworkHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/OrgNetworkHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/OrgNetworkHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/SupportedVersionsHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/SupportedVersionsHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/SupportedVersionsHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/SupportedVersionsHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/TaskHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/TaskHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/TaskHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/TaskHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/TasksListHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/TasksListHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/TasksListHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/TasksListHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/VAppHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VAppHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/VAppHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VAppHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/VAppTemplateHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VAppTemplateHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/VAppTemplateHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VAppTemplateHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/VCloudVirtualHardwareHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VCloudVirtualHardwareHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/VCloudVirtualHardwareHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VCloudVirtualHardwareHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/VDCHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VDCHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/VDCHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VDCHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/VirtualHardwareSectionHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VirtualHardwareSectionHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/VirtualHardwareSectionHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VirtualHardwareSectionHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/VmHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VmHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/VmHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/VmHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/NetworkSectionHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/NetworkSectionHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/NetworkSectionHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/NetworkSectionHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/OperatingSystemSectionHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/OperatingSystemSectionHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/OperatingSystemSectionHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/OperatingSystemSectionHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/OvfEnvelopeHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/OvfEnvelopeHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/OvfEnvelopeHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/OvfEnvelopeHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/ResourceAllocationHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/ResourceAllocationHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/ResourceAllocationHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/ResourceAllocationHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/SystemHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/SystemHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/SystemHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/SystemHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudNetworkSectionHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudNetworkSectionHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudNetworkSectionHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudNetworkSectionHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudResourceAllocationHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudResourceAllocationHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudResourceAllocationHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/VCloudResourceAllocationHandler.java diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/VirtualSystemHandler.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/VirtualSystemHandler.java similarity index 100% rename from vcloud/core/src/main/java/org/jclouds/vcloud/xml/ovf/VirtualSystemHandler.java rename to apis/vcloud/src/main/java/org/jclouds/vcloud/xml/ovf/VirtualSystemHandler.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/CaptureVAppLiveTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/CaptureVAppLiveTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/CaptureVAppLiveTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/CaptureVAppLiveTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/CommonVCloudClientLiveTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/CommonVCloudClientLiveTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/CommonVCloudClientLiveTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/CommonVCloudClientLiveTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/ProvidersInPropertiesTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/ProvidersInPropertiesTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/ProvidersInPropertiesTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/ProvidersInPropertiesTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudAsyncClientTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudAsyncClientTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/VCloudAsyncClientTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudAsyncClientTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudClientLiveTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudClientLiveTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/VCloudClientLiveTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudClientLiveTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudExpressClientLiveTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudExpressClientLiveTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/VCloudExpressClientLiveTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudExpressClientLiveTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudGuestCustomizationLiveTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudGuestCustomizationLiveTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/VCloudGuestCustomizationLiveTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudGuestCustomizationLiveTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudLoginAsyncClientTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudLoginAsyncClientTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/VCloudLoginAsyncClientTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudLoginAsyncClientTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudVersionsAsyncClientTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudVersionsAsyncClientTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/VCloudVersionsAsyncClientTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/VCloudVersionsAsyncClientTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayloadTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayloadTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayloadTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayloadTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/binders/BindDeployVAppParamsToXmlPayloadTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindDeployVAppParamsToXmlPayloadTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/binders/BindDeployVAppParamsToXmlPayloadTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindDeployVAppParamsToXmlPayloadTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayloadTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayloadTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayloadTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayloadTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayloadTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayloadTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayloadTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayloadTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/binders/BindUndeployVAppParamsToXmlPayloadTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindUndeployVAppParamsToXmlPayloadTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/binders/BindUndeployVAppParamsToXmlPayloadTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindUndeployVAppParamsToXmlPayloadTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/binders/VCloudExpressBindCloneVAppParamsToXmlPayloadTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/VCloudExpressBindCloneVAppParamsToXmlPayloadTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/binders/VCloudExpressBindCloneVAppParamsToXmlPayloadTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/binders/VCloudExpressBindCloneVAppParamsToXmlPayloadTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModuleTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModuleTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModuleTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModuleTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModuleTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModuleTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModuleTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModuleTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptionsTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptionsTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptionsTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptionsTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapterTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapterTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapterTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapterTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/filters/SetVCloudTokenCookieTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/filters/SetVCloudTokenCookieTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/filters/SetVCloudTokenCookieTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/filters/SetVCloudTokenCookieTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeadersTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeadersTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeadersTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeadersTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/handlers/ParseVCloudErrorFromHttpResponseTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/handlers/ParseVCloudErrorFromHttpResponseTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/handlers/ParseVCloudErrorFromHttpResponseTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/handlers/ParseVCloudErrorFromHttpResponseTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptionsTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptionsTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptionsTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptionsTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/CatalogHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/CatalogHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/CatalogHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/CatalogHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/CatalogItemHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/CatalogItemHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/CatalogItemHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/CatalogItemHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/GuestCustomizationSectionHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/GuestCustomizationSectionHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/GuestCustomizationSectionHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/GuestCustomizationSectionHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/NetworkConnectionHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/NetworkConnectionHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/NetworkConnectionHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/NetworkConnectionHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/NetworkConnectionSectionHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/NetworkConnectionSectionHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/NetworkConnectionSectionHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/NetworkConnectionSectionHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/OrgHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/OrgHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/OrgHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/OrgHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/OrgListHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/OrgListHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/OrgListHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/OrgListHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/OrgNetworkHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/OrgNetworkHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/OrgNetworkHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/OrgNetworkHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/SupportedVersionsHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/SupportedVersionsHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/SupportedVersionsHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/SupportedVersionsHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/TaskHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/TaskHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/TaskHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/TaskHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/TasksListHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/TasksListHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/TasksListHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/TasksListHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/VAppHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VAppHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/VAppHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VAppHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/VAppTemplateHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VAppTemplateHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/VAppTemplateHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VAppTemplateHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/VDCHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VDCHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/VDCHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VDCHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/VmHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VmHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/VmHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/VmHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/ovf/OvfEnvelopeHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/OvfEnvelopeHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/ovf/OvfEnvelopeHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/OvfEnvelopeHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/ovf/ResourceAllocationHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/ResourceAllocationHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/ovf/ResourceAllocationHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/ResourceAllocationHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/ovf/SystemHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/SystemHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/ovf/SystemHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/SystemHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudExpressVAppHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudExpressVAppHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudExpressVAppHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudExpressVAppHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemSectionHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemSectionHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemSectionHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemSectionHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/xml/ovf/VirtualSystemHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VirtualSystemHandlerTest.java similarity index 100% rename from vcloud/core/src/test/java/org/jclouds/vcloud/xml/ovf/VirtualSystemHandlerTest.java rename to apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VirtualSystemHandlerTest.java diff --git a/vcloud/core/src/test/resources/captureVApp-default.xml b/apis/vcloud/src/test/resources/captureVApp-default.xml similarity index 100% rename from vcloud/core/src/test/resources/captureVApp-default.xml rename to apis/vcloud/src/test/resources/captureVApp-default.xml diff --git a/vcloud/core/src/test/resources/captureVApp.xml b/apis/vcloud/src/test/resources/captureVApp.xml similarity index 100% rename from vcloud/core/src/test/resources/captureVApp.xml rename to apis/vcloud/src/test/resources/captureVApp.xml diff --git a/vcloud/core/src/test/resources/catalog-blank.xml b/apis/vcloud/src/test/resources/catalog-blank.xml similarity index 100% rename from vcloud/core/src/test/resources/catalog-blank.xml rename to apis/vcloud/src/test/resources/catalog-blank.xml diff --git a/vcloud/core/src/test/resources/catalog-hosting.xml b/apis/vcloud/src/test/resources/catalog-hosting.xml similarity index 100% rename from vcloud/core/src/test/resources/catalog-hosting.xml rename to apis/vcloud/src/test/resources/catalog-hosting.xml diff --git a/vcloud/core/src/test/resources/catalogItem-hosting.xml b/apis/vcloud/src/test/resources/catalogItem-hosting.xml similarity index 100% rename from vcloud/core/src/test/resources/catalogItem-hosting.xml rename to apis/vcloud/src/test/resources/catalogItem-hosting.xml diff --git a/vcloud/core/src/test/resources/catalogItem-terremark.xml b/apis/vcloud/src/test/resources/catalogItem-terremark.xml similarity index 100% rename from vcloud/core/src/test/resources/catalogItem-terremark.xml rename to apis/vcloud/src/test/resources/catalogItem-terremark.xml diff --git a/vcloud/core/src/test/resources/cloneVApp-default.xml b/apis/vcloud/src/test/resources/cloneVApp-default.xml similarity index 100% rename from vcloud/core/src/test/resources/cloneVApp-default.xml rename to apis/vcloud/src/test/resources/cloneVApp-default.xml diff --git a/vcloud/core/src/test/resources/cloneVApp.xml b/apis/vcloud/src/test/resources/cloneVApp.xml similarity index 100% rename from vcloud/core/src/test/resources/cloneVApp.xml rename to apis/vcloud/src/test/resources/cloneVApp.xml diff --git a/vcloud/core/src/test/resources/express/catalog.xml b/apis/vcloud/src/test/resources/express/catalog.xml similarity index 100% rename from vcloud/core/src/test/resources/express/catalog.xml rename to apis/vcloud/src/test/resources/express/catalog.xml diff --git a/vcloud/core/src/test/resources/express/cloneVApp-default.xml b/apis/vcloud/src/test/resources/express/cloneVApp-default.xml similarity index 100% rename from vcloud/core/src/test/resources/express/cloneVApp-default.xml rename to apis/vcloud/src/test/resources/express/cloneVApp-default.xml diff --git a/vcloud/core/src/test/resources/express/cloneVApp.xml b/apis/vcloud/src/test/resources/express/cloneVApp.xml similarity index 100% rename from vcloud/core/src/test/resources/express/cloneVApp.xml rename to apis/vcloud/src/test/resources/express/cloneVApp.xml diff --git a/vcloud/core/src/test/resources/express/network-bluelock.xml b/apis/vcloud/src/test/resources/express/network-bluelock.xml similarity index 100% rename from vcloud/core/src/test/resources/express/network-bluelock.xml rename to apis/vcloud/src/test/resources/express/network-bluelock.xml diff --git a/vcloud/core/src/test/resources/express/network-hosting.xml b/apis/vcloud/src/test/resources/express/network-hosting.xml similarity index 100% rename from vcloud/core/src/test/resources/express/network-hosting.xml rename to apis/vcloud/src/test/resources/express/network-hosting.xml diff --git a/vcloud/core/src/test/resources/express/network-terremark.xml b/apis/vcloud/src/test/resources/express/network-terremark.xml similarity index 100% rename from vcloud/core/src/test/resources/express/network-terremark.xml rename to apis/vcloud/src/test/resources/express/network-terremark.xml diff --git a/vcloud/core/src/test/resources/express/newvapp-cpumemdisk.xml b/apis/vcloud/src/test/resources/express/newvapp-cpumemdisk.xml similarity index 100% rename from vcloud/core/src/test/resources/express/newvapp-cpumemdisk.xml rename to apis/vcloud/src/test/resources/express/newvapp-cpumemdisk.xml diff --git a/vcloud/core/src/test/resources/express/newvapp-hosting.xml b/apis/vcloud/src/test/resources/express/newvapp-hosting.xml similarity index 100% rename from vcloud/core/src/test/resources/express/newvapp-hosting.xml rename to apis/vcloud/src/test/resources/express/newvapp-hosting.xml diff --git a/vcloud/core/src/test/resources/express/newvapp-hostingcpumemdisk.xml b/apis/vcloud/src/test/resources/express/newvapp-hostingcpumemdisk.xml similarity index 100% rename from vcloud/core/src/test/resources/express/newvapp-hostingcpumemdisk.xml rename to apis/vcloud/src/test/resources/express/newvapp-hostingcpumemdisk.xml diff --git a/vcloud/core/src/test/resources/express/newvapp-hostingnetworknamedhcpfencemode.xml b/apis/vcloud/src/test/resources/express/newvapp-hostingnetworknamedhcpfencemode.xml similarity index 100% rename from vcloud/core/src/test/resources/express/newvapp-hostingnetworknamedhcpfencemode.xml rename to apis/vcloud/src/test/resources/express/newvapp-hostingnetworknamedhcpfencemode.xml diff --git a/vcloud/core/src/test/resources/express/newvapp-networknamedhcpfencemode.xml b/apis/vcloud/src/test/resources/express/newvapp-networknamedhcpfencemode.xml similarity index 100% rename from vcloud/core/src/test/resources/express/newvapp-networknamedhcpfencemode.xml rename to apis/vcloud/src/test/resources/express/newvapp-networknamedhcpfencemode.xml diff --git a/vcloud/core/src/test/resources/express/newvapp.xml b/apis/vcloud/src/test/resources/express/newvapp.xml similarity index 100% rename from vcloud/core/src/test/resources/express/newvapp.xml rename to apis/vcloud/src/test/resources/express/newvapp.xml diff --git a/vcloud/core/src/test/resources/express/org-hosting.xml b/apis/vcloud/src/test/resources/express/org-hosting.xml similarity index 100% rename from vcloud/core/src/test/resources/express/org-hosting.xml rename to apis/vcloud/src/test/resources/express/org-hosting.xml diff --git a/vcloud/core/src/test/resources/express/org.xml b/apis/vcloud/src/test/resources/express/org.xml similarity index 100% rename from vcloud/core/src/test/resources/express/org.xml rename to apis/vcloud/src/test/resources/express/org.xml diff --git a/vcloud/core/src/test/resources/express/task-error.xml b/apis/vcloud/src/test/resources/express/task-error.xml similarity index 100% rename from vcloud/core/src/test/resources/express/task-error.xml rename to apis/vcloud/src/test/resources/express/task-error.xml diff --git a/vcloud/core/src/test/resources/express/task-hosting.xml b/apis/vcloud/src/test/resources/express/task-hosting.xml similarity index 100% rename from vcloud/core/src/test/resources/express/task-hosting.xml rename to apis/vcloud/src/test/resources/express/task-hosting.xml diff --git a/vcloud/core/src/test/resources/express/task-self.xml b/apis/vcloud/src/test/resources/express/task-self.xml similarity index 100% rename from vcloud/core/src/test/resources/express/task-self.xml rename to apis/vcloud/src/test/resources/express/task-self.xml diff --git a/vcloud/core/src/test/resources/express/task.xml b/apis/vcloud/src/test/resources/express/task.xml similarity index 100% rename from vcloud/core/src/test/resources/express/task.xml rename to apis/vcloud/src/test/resources/express/task.xml diff --git a/vcloud/core/src/test/resources/express/vAppTemplate-hosting.xml b/apis/vcloud/src/test/resources/express/vAppTemplate-hosting.xml similarity index 100% rename from vcloud/core/src/test/resources/express/vAppTemplate-hosting.xml rename to apis/vcloud/src/test/resources/express/vAppTemplate-hosting.xml diff --git a/vcloud/core/src/test/resources/express/vAppTemplate-trmk.xml b/apis/vcloud/src/test/resources/express/vAppTemplate-trmk.xml similarity index 100% rename from vcloud/core/src/test/resources/express/vAppTemplate-trmk.xml rename to apis/vcloud/src/test/resources/express/vAppTemplate-trmk.xml diff --git a/vcloud/core/src/test/resources/express/vdc-hosting.xml b/apis/vcloud/src/test/resources/express/vdc-hosting.xml similarity index 100% rename from vcloud/core/src/test/resources/express/vdc-hosting.xml rename to apis/vcloud/src/test/resources/express/vdc-hosting.xml diff --git a/vcloud/core/src/test/resources/express/vdc-nonet.xml b/apis/vcloud/src/test/resources/express/vdc-nonet.xml similarity index 100% rename from vcloud/core/src/test/resources/express/vdc-nonet.xml rename to apis/vcloud/src/test/resources/express/vdc-nonet.xml diff --git a/vcloud/core/src/test/resources/express/vdc.xml b/apis/vcloud/src/test/resources/express/vdc.xml similarity index 100% rename from vcloud/core/src/test/resources/express/vdc.xml rename to apis/vcloud/src/test/resources/express/vdc.xml diff --git a/vcloud/core/src/test/resources/guestCustomization.xml b/apis/vcloud/src/test/resources/guestCustomization.xml similarity index 100% rename from vcloud/core/src/test/resources/guestCustomization.xml rename to apis/vcloud/src/test/resources/guestCustomization.xml diff --git a/vcloud/core/src/test/resources/guestCustomizationSection.xml b/apis/vcloud/src/test/resources/guestCustomizationSection.xml similarity index 100% rename from vcloud/core/src/test/resources/guestCustomizationSection.xml rename to apis/vcloud/src/test/resources/guestCustomizationSection.xml diff --git a/vcloud/core/src/test/resources/instantiatedvapp.xml b/apis/vcloud/src/test/resources/instantiatedvapp.xml similarity index 100% rename from vcloud/core/src/test/resources/instantiatedvapp.xml rename to apis/vcloud/src/test/resources/instantiatedvapp.xml diff --git a/vcloud/core/src/test/resources/instantiationparams-customization.xml b/apis/vcloud/src/test/resources/instantiationparams-customization.xml similarity index 100% rename from vcloud/core/src/test/resources/instantiationparams-customization.xml rename to apis/vcloud/src/test/resources/instantiationparams-customization.xml diff --git a/vcloud/core/src/test/resources/instantiationparams-network.xml b/apis/vcloud/src/test/resources/instantiationparams-network.xml similarity index 100% rename from vcloud/core/src/test/resources/instantiationparams-network.xml rename to apis/vcloud/src/test/resources/instantiationparams-network.xml diff --git a/vcloud/core/src/test/resources/instantiationparams.xml b/apis/vcloud/src/test/resources/instantiationparams.xml similarity index 100% rename from vcloud/core/src/test/resources/instantiationparams.xml rename to apis/vcloud/src/test/resources/instantiationparams.xml diff --git a/vcloud/bluelock/src/test/resources/log4j.xml b/apis/vcloud/src/test/resources/log4j.xml old mode 100644 new mode 100755 similarity index 100% rename from vcloud/bluelock/src/test/resources/log4j.xml rename to apis/vcloud/src/test/resources/log4j.xml diff --git a/vcloud/core/src/test/resources/networkconnection.xml b/apis/vcloud/src/test/resources/networkconnection.xml similarity index 100% rename from vcloud/core/src/test/resources/networkconnection.xml rename to apis/vcloud/src/test/resources/networkconnection.xml diff --git a/vcloud/core/src/test/resources/networkconnectionsection.xml b/apis/vcloud/src/test/resources/networkconnectionsection.xml similarity index 100% rename from vcloud/core/src/test/resources/networkconnectionsection.xml rename to apis/vcloud/src/test/resources/networkconnectionsection.xml diff --git a/vcloud/core/src/test/resources/org.xml b/apis/vcloud/src/test/resources/org.xml similarity index 100% rename from vcloud/core/src/test/resources/org.xml rename to apis/vcloud/src/test/resources/org.xml diff --git a/vcloud/core/src/test/resources/orglist.xml b/apis/vcloud/src/test/resources/orglist.xml similarity index 100% rename from vcloud/core/src/test/resources/orglist.xml rename to apis/vcloud/src/test/resources/orglist.xml diff --git a/vcloud/core/src/test/resources/orgnetwork-bridged.xml b/apis/vcloud/src/test/resources/orgnetwork-bridged.xml similarity index 100% rename from vcloud/core/src/test/resources/orgnetwork-bridged.xml rename to apis/vcloud/src/test/resources/orgnetwork-bridged.xml diff --git a/vcloud/core/src/test/resources/orgnetwork-isolated.xml b/apis/vcloud/src/test/resources/orgnetwork-isolated.xml similarity index 100% rename from vcloud/core/src/test/resources/orgnetwork-isolated.xml rename to apis/vcloud/src/test/resources/orgnetwork-isolated.xml diff --git a/vcloud/core/src/test/resources/os.xml b/apis/vcloud/src/test/resources/os.xml similarity index 100% rename from vcloud/core/src/test/resources/os.xml rename to apis/vcloud/src/test/resources/os.xml diff --git a/vcloud/core/src/test/resources/ovf.xml b/apis/vcloud/src/test/resources/ovf.xml similarity index 100% rename from vcloud/core/src/test/resources/ovf.xml rename to apis/vcloud/src/test/resources/ovf.xml diff --git a/vcloud/core/src/test/resources/resourceallocation-hosting.xml b/apis/vcloud/src/test/resources/resourceallocation-hosting.xml similarity index 100% rename from vcloud/core/src/test/resources/resourceallocation-hosting.xml rename to apis/vcloud/src/test/resources/resourceallocation-hosting.xml diff --git a/vcloud/core/src/test/resources/task.xml b/apis/vcloud/src/test/resources/task.xml similarity index 100% rename from vcloud/core/src/test/resources/task.xml rename to apis/vcloud/src/test/resources/task.xml diff --git a/vcloud/core/src/test/resources/taskslist-hosting.xml b/apis/vcloud/src/test/resources/taskslist-hosting.xml similarity index 100% rename from vcloud/core/src/test/resources/taskslist-hosting.xml rename to apis/vcloud/src/test/resources/taskslist-hosting.xml diff --git a/vcloud/core/src/test/resources/taskslist.xml b/apis/vcloud/src/test/resources/taskslist.xml similarity index 100% rename from vcloud/core/src/test/resources/taskslist.xml rename to apis/vcloud/src/test/resources/taskslist.xml diff --git a/vcloud/core/src/test/resources/vAppTemplate-copying.xml b/apis/vcloud/src/test/resources/vAppTemplate-copying.xml similarity index 100% rename from vcloud/core/src/test/resources/vAppTemplate-copying.xml rename to apis/vcloud/src/test/resources/vAppTemplate-copying.xml diff --git a/vcloud/core/src/test/resources/vAppTemplate.xml b/apis/vcloud/src/test/resources/vAppTemplate.xml similarity index 100% rename from vcloud/core/src/test/resources/vAppTemplate.xml rename to apis/vcloud/src/test/resources/vAppTemplate.xml diff --git a/vcloud/core/src/test/resources/vapp-hosting.xml b/apis/vcloud/src/test/resources/vapp-hosting.xml similarity index 100% rename from vcloud/core/src/test/resources/vapp-hosting.xml rename to apis/vcloud/src/test/resources/vapp-hosting.xml diff --git a/vcloud/core/src/test/resources/vapp-rhel-off-static.xml b/apis/vcloud/src/test/resources/vapp-rhel-off-static.xml similarity index 100% rename from vcloud/core/src/test/resources/vapp-rhel-off-static.xml rename to apis/vcloud/src/test/resources/vapp-rhel-off-static.xml diff --git a/vcloud/core/src/test/resources/vapp-ubuntu-off-dhcp.xml b/apis/vcloud/src/test/resources/vapp-ubuntu-off-dhcp.xml similarity index 100% rename from vcloud/core/src/test/resources/vapp-ubuntu-off-dhcp.xml rename to apis/vcloud/src/test/resources/vapp-ubuntu-off-dhcp.xml diff --git a/vcloud/core/src/test/resources/vapp-unresolved.xml b/apis/vcloud/src/test/resources/vapp-unresolved.xml similarity index 100% rename from vcloud/core/src/test/resources/vapp-unresolved.xml rename to apis/vcloud/src/test/resources/vapp-unresolved.xml diff --git a/vcloud/core/src/test/resources/vapp-win-off-static.xml b/apis/vcloud/src/test/resources/vapp-win-off-static.xml similarity index 100% rename from vcloud/core/src/test/resources/vapp-win-off-static.xml rename to apis/vcloud/src/test/resources/vapp-win-off-static.xml diff --git a/vcloud/core/src/test/resources/vapp.xml b/apis/vcloud/src/test/resources/vapp.xml similarity index 100% rename from vcloud/core/src/test/resources/vapp.xml rename to apis/vcloud/src/test/resources/vapp.xml diff --git a/vcloud/core/src/test/resources/vapp2.xml b/apis/vcloud/src/test/resources/vapp2.xml similarity index 100% rename from vcloud/core/src/test/resources/vapp2.xml rename to apis/vcloud/src/test/resources/vapp2.xml diff --git a/vcloud/core/src/test/resources/vdc.xml b/apis/vcloud/src/test/resources/vdc.xml similarity index 100% rename from vcloud/core/src/test/resources/vdc.xml rename to apis/vcloud/src/test/resources/vdc.xml diff --git a/vcloud/core/src/test/resources/versions.xml b/apis/vcloud/src/test/resources/versions.xml similarity index 100% rename from vcloud/core/src/test/resources/versions.xml rename to apis/vcloud/src/test/resources/versions.xml diff --git a/vcloud/core/src/test/resources/virtualhardwaresection.xml b/apis/vcloud/src/test/resources/virtualhardwaresection.xml similarity index 100% rename from vcloud/core/src/test/resources/virtualhardwaresection.xml rename to apis/vcloud/src/test/resources/virtualhardwaresection.xml diff --git a/vcloud/core/src/test/resources/virtualsystem-hosting.xml b/apis/vcloud/src/test/resources/virtualsystem-hosting.xml similarity index 100% rename from vcloud/core/src/test/resources/virtualsystem-hosting.xml rename to apis/vcloud/src/test/resources/virtualsystem-hosting.xml diff --git a/vcloud/core/src/test/resources/virtualsystem.xml b/apis/vcloud/src/test/resources/virtualsystem.xml similarity index 100% rename from vcloud/core/src/test/resources/virtualsystem.xml rename to apis/vcloud/src/test/resources/virtualsystem.xml diff --git a/vcloud/core/src/test/resources/vm-rhel-off-static.xml b/apis/vcloud/src/test/resources/vm-rhel-off-static.xml similarity index 100% rename from vcloud/core/src/test/resources/vm-rhel-off-static.xml rename to apis/vcloud/src/test/resources/vm-rhel-off-static.xml diff --git a/pom.xml b/pom.xml index 0a9d1d4fb7..ef7a9a0daf 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,6 @@ scriptbuilder azure atmos - vcloud elasticstack allcompute allblobstore diff --git a/vcloud/bluelock/README.txt b/providers/bluelock-vcdirector/README.txt similarity index 100% rename from vcloud/bluelock/README.txt rename to providers/bluelock-vcdirector/README.txt diff --git a/vcloud/bluelock/pom.xml b/providers/bluelock-vcdirector/pom.xml similarity index 65% rename from vcloud/bluelock/pom.xml rename to providers/bluelock-vcdirector/pom.xml index 75c49003af..aad8ea4284 100644 --- a/vcloud/bluelock/pom.xml +++ b/providers/bluelock-vcdirector/pom.xml @@ -20,47 +20,74 @@ --> - + 4.0.0 org.jclouds - jclouds-vcloud-project + jclouds-project 1.0-SNAPSHOT + ../../project/pom.xml - org.jclouds - jclouds-bluelock - jclouds bluelock Components Core - jclouds core components to access bluelock + org.jclouds.provider + bluelock-vcdirector + jclouds BlueLock vCloud Director provider + vCloud implementation targeted to BlueLock - - https://vcenterprise.bluelock.com/api 1.0 - FIXME - FIXME + FIXME_IDENTITY + FIXME_CREDENTIAL - - scm:svn:http://jclouds.googlecode.com/svn/trunk/vcloud/bluelock - scm:svn:https://jclouds.googlecode.com/svn/trunk/vcloud/bluelock - http://jclouds.googlecode.com/svn/trunk/vcloud/bluelock - - - ${project.groupId} - jclouds-vcloud + org.jclouds.api + vcloud ${project.version} - ${project.groupId} - jclouds-vcloud + org.jclouds.api + vcloud ${project.version} test-jar test + + org.jclouds + jclouds-core + ${project.version} + test-jar + test + + + org.jclouds + jclouds-compute + ${project.version} + test-jar + test + + + org.jclouds + jclouds-log4j + ${project.version} + test + + + org.jclouds + jclouds-jsch + ${project.version} + test + + + log4j + log4j + 1.2.16 + test + + live @@ -94,10 +121,6 @@ test.bluelock-vcdirector.credential ${test.bluelock-vcdirector.credential} - - jclouds.compute.blacklist-nodes - ${jclouds.compute.blacklist-nodes} - @@ -107,4 +130,7 @@ + + + diff --git a/vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorContextBuilder.java b/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorContextBuilder.java similarity index 100% rename from vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorContextBuilder.java rename to providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorContextBuilder.java diff --git a/vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorPropertiesBuilder.java b/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorPropertiesBuilder.java similarity index 100% rename from vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorPropertiesBuilder.java rename to providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorPropertiesBuilder.java diff --git a/vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/config/BlueLockVCloudDirectorRestClientModule.java b/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/config/BlueLockVCloudDirectorRestClientModule.java similarity index 100% rename from vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/config/BlueLockVCloudDirectorRestClientModule.java rename to providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/config/BlueLockVCloudDirectorRestClientModule.java diff --git a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorClientLiveTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorClientLiveTest.java similarity index 100% rename from vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorClientLiveTest.java rename to providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorClientLiveTest.java diff --git a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorGuestCustomizationLiveTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorGuestCustomizationLiveTest.java similarity index 100% rename from vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorGuestCustomizationLiveTest.java rename to providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorGuestCustomizationLiveTest.java diff --git a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/ProvidersInPropertiesTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/ProvidersInPropertiesTest.java similarity index 100% rename from vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/ProvidersInPropertiesTest.java rename to providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/ProvidersInPropertiesTest.java diff --git a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/VCloudSessionRefreshLiveTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/VCloudSessionRefreshLiveTest.java similarity index 100% rename from vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/VCloudSessionRefreshLiveTest.java rename to providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/VCloudSessionRefreshLiveTest.java diff --git a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java similarity index 100% rename from vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java rename to providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java diff --git a/vcloud/bluelock/src/test/resources/bluelock/vdc.xml b/providers/bluelock-vcdirector/src/test/resources/bluelock/vdc.xml similarity index 100% rename from vcloud/bluelock/src/test/resources/bluelock/vdc.xml rename to providers/bluelock-vcdirector/src/test/resources/bluelock/vdc.xml diff --git a/vcloud/core/src/test/resources/log4j.xml b/providers/bluelock-vcdirector/src/test/resources/log4j.xml old mode 100755 new mode 100644 similarity index 100% rename from vcloud/core/src/test/resources/log4j.xml rename to providers/bluelock-vcdirector/src/test/resources/log4j.xml diff --git a/providers/pom.xml b/providers/pom.xml index 451536ca53..a30e991d7f 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -47,5 +47,6 @@ cloudservers-uk cloudfiles-us cloudfiles-uk + bluelock-vcdirector