You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2013/09/30 18:15:37 UTC
[17/17] git commit: JCLOUDS-304. Remove broken terremark providers
JCLOUDS-304. Remove broken terremark providers
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/ddfefd7e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/ddfefd7e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/ddfefd7e
Branch: refs/heads/master
Commit: ddfefd7ec7cc49c1796ab6131d3e6e8fbd75aa7d
Parents: 06b8cd7
Author: Adrian Cole <ad...@gmail.com>
Authored: Fri Sep 27 17:10:56 2013 -0700
Committer: Adrian Cole <ad...@gmail.com>
Committed: Mon Sep 30 09:00:24 2013 -0700
----------------------------------------------------------------------
allcompute/pom.xml | 10 -
common/pom.xml | 1 -
common/trmk/pom.xml | 81 --
.../trmk/vcloud_0_8/TerremarkVCloudApi.java | 576 --------------
.../vcloud_0_8/TerremarkVCloudFallbacks.java | 64 --
.../vcloud_0_8/TerremarkVCloudMediaType.java | 277 -------
.../vcloud_0_8/VCloudResponseException.java | 69 --
.../jclouds/trmk/vcloud_0_8/VCloudToken.java | 37 -
.../BindAddInternetServiceToXmlPayload.java | 89 ---
.../binders/BindAddNodeServiceToXmlPayload.java | 79 --
.../BindCloneVAppParamsToXmlPayload.java | 127 ---
.../binders/BindCreateKeyToXmlPayload.java | 70 --
...stantiateVAppTemplateParamsToXmlPayload.java | 216 -----
.../BindNodeConfigurationToXmlPayload.java | 83 --
.../BindVAppConfigurationToXmlPayload.java | 217 -----
.../OrgNameAndCatalogNameToEndpoint.java | 78 --
.../OrgNameAndTasksListNameToEndpoint.java | 78 --
.../binders/OrgNameAndVDCNameToEndpoint.java | 78 --
.../OrgNameCatalogNameItemNameToEndpoint.java | 77 --
...meCatalogNameVAppTemplateNameToEndpoint.java | 90 ---
.../OrgNameVDCNameNetworkNameToEndpoint.java | 54 --
...NameVDCNameResourceEntityNameToEndpoint.java | 54 --
.../OrgNameVDCNameResourceNameToEndpoint.java | 81 --
.../compute/TerremarkVCloudComputeClient.java | 393 ---------
.../compute/TerremarkVCloudComputeService.java | 114 ---
.../TerremarkBindComputeStrategiesByClass.java | 86 --
.../TerremarkBindComputeSuppliersByClass.java | 44 -
...remarkVCloudComputeServiceContextModule.java | 135 ----
.../vcloud_0_8/compute/domain/OrgAndName.java | 78 --
.../compute/functions/CreateUniqueKeyPair.java | 84 --
.../functions/FindLocationForResource.java | 69 --
.../functions/HardwareForVCloudExpressVApp.java | 70 --
.../ImageForVCloudExpressVAppTemplate.java | 76 --
.../functions/ImagesInVCloudExpressOrg.java | 62 --
.../functions/ImagesInVCloudExpressVDC.java | 54 --
.../functions/NodeMetadataToOrgAndName.java | 71 --
.../functions/ParseOsFromVAppTemplateName.java | 62 --
.../functions/TemplateToInstantiateOptions.java | 47 --
.../compute/functions/VAppToNodeMetadata.java | 105 ---
.../options/TerremarkVCloudTemplateOptions.java | 270 -------
.../compute/strategy/CleanupOrphanKeys.java | 76 --
...eNewKeyPairUnlessUserSpecifiedOtherwise.java | 81 --
.../compute/strategy/DeleteKeyPair.java | 63 --
...DescriptionToGetDefaultLoginCredentials.java | 78 --
.../StartVAppWithGroupEncodedIntoName.java | 79 --
...eTagIntoNameRunNodesAndAddToSetStrategy.java | 77 --
.../TerremarkVCloudDestroyNodeStrategy.java | 52 --
.../TerremarkVCloudGetImageStrategy.java | 57 --
.../TerremarkVCloudGetNodeMetadataStrategy.java | 57 --
.../TerremarkVCloudLifeCycleStrategy.java | 84 --
.../TerremarkVCloudListNodesStrategy.java | 147 ----
.../suppliers/StaticHardwareSupplier.java | 50 --
.../compute/suppliers/VAppTemplatesInOrgs.java | 73 --
.../suppliers/VCloudHardwareSupplier.java | 93 ---
.../compute/suppliers/VCloudImageSupplier.java | 93 ---
.../vcloud_0_8/config/DefaultCatalogForOrg.java | 63 --
.../vcloud_0_8/config/DefaultNetworkForVDC.java | 66 --
.../vcloud_0_8/config/DefaultOrgForUser.java | 58 --
.../config/DefaultTasksListForOrg.java | 63 --
.../config/DefaultVCloudReferencesModule.java | 140 ----
.../vcloud_0_8/config/DefaultVDCForOrg.java | 63 --
.../config/TerremarkVCloudHttpApiModule.java | 558 -------------
.../trmk/vcloud_0_8/domain/Capacity.java | 108 ---
.../jclouds/trmk/vcloud_0_8/domain/Catalog.java | 41 -
.../trmk/vcloud_0_8/domain/CatalogItem.java | 40 -
.../vcloud_0_8/domain/ComputePoolReference.java | 100 ---
.../domain/CustomizationParameters.java | 86 --
.../trmk/vcloud_0_8/domain/DataCenter.java | 129 ---
.../trmk/vcloud_0_8/domain/FenceMode.java | 67 --
.../trmk/vcloud_0_8/domain/InternetService.java | 146 ----
.../trmk/vcloud_0_8/domain/IpAddress.java | 121 ---
.../jclouds/trmk/vcloud_0_8/domain/KeyPair.java | 117 ---
.../jclouds/trmk/vcloud_0_8/domain/Network.java | 55 --
.../trmk/vcloud_0_8/domain/NetworkAdapter.java | 111 ---
.../vcloud_0_8/domain/NetworkExtendedInfo.java | 193 -----
.../jclouds/trmk/vcloud_0_8/domain/Node.java | 123 ---
.../org/jclouds/trmk/vcloud_0_8/domain/Org.java | 70 --
.../trmk/vcloud_0_8/domain/Protocol.java | 30 -
.../trmk/vcloud_0_8/domain/PublicIpAddress.java | 81 --
.../trmk/vcloud_0_8/domain/ReferenceType.java | 51 --
.../jclouds/trmk/vcloud_0_8/domain/Status.java | 113 ---
.../jclouds/trmk/vcloud_0_8/domain/Subnet.java | 100 ---
.../jclouds/trmk/vcloud_0_8/domain/Task.java | 72 --
.../trmk/vcloud_0_8/domain/TaskStatus.java | 71 --
.../trmk/vcloud_0_8/domain/TasksList.java | 37 -
.../jclouds/trmk/vcloud_0_8/domain/VApp.java | 67 --
.../vcloud_0_8/domain/VAppConfiguration.java | 158 ----
.../vcloud_0_8/domain/VAppExtendedInfo.java | 174 ----
.../trmk/vcloud_0_8/domain/VAppTemplate.java | 29 -
.../trmk/vcloud_0_8/domain/VCloudError.java | 123 ---
.../trmk/vcloud_0_8/domain/VCloudSession.java | 29 -
.../org/jclouds/trmk/vcloud_0_8/domain/VDC.java | 65 --
.../vcloud_0_8/domain/internal/CatalogImpl.java | 131 ---
.../domain/internal/CatalogItemImpl.java | 137 ----
.../vcloud_0_8/domain/internal/ErrorImpl.java | 119 ---
.../vcloud_0_8/domain/internal/NetworkImpl.java | 107 ---
.../vcloud_0_8/domain/internal/OrgImpl.java | 139 ----
.../domain/internal/ReferenceTypeImpl.java | 101 ---
.../vcloud_0_8/domain/internal/TaskImpl.java | 164 ----
.../domain/internal/TasksListImpl.java | 81 --
.../vcloud_0_8/domain/internal/VAppImpl.java | 234 ------
.../domain/internal/VAppTemplateImpl.java | 87 --
.../vcloud_0_8/domain/internal/VDCImpl.java | 168 ----
.../trmk/vcloud_0_8/endpoints/Catalog.java | 37 -
.../trmk/vcloud_0_8/endpoints/DataCenters.java | 37 -
.../vcloud_0_8/endpoints/InternetServices.java | 37 -
.../jclouds/trmk/vcloud_0_8/endpoints/Keys.java | 37 -
.../trmk/vcloud_0_8/endpoints/Network.java | 37 -
.../jclouds/trmk/vcloud_0_8/endpoints/Org.java | 37 -
.../trmk/vcloud_0_8/endpoints/OrgList.java | 37 -
.../trmk/vcloud_0_8/endpoints/PublicIPs.java | 37 -
.../jclouds/trmk/vcloud_0_8/endpoints/Tags.java | 37 -
.../trmk/vcloud_0_8/endpoints/TasksList.java | 37 -
.../trmk/vcloud_0_8/endpoints/VAppCatalog.java | 37 -
.../trmk/vcloud_0_8/endpoints/VCloudLogin.java | 38 -
.../jclouds/trmk/vcloud_0_8/endpoints/VDC.java | 37 -
.../filters/SetVCloudTokenCookie.java | 49 --
.../functions/AllCatalogItemsInCatalog.java | 64 --
.../functions/AllCatalogItemsInOrg.java | 62 --
.../vcloud_0_8/functions/AllCatalogsInOrg.java | 57 --
.../trmk/vcloud_0_8/functions/AllVDCsInOrg.java | 57 --
.../vcloud_0_8/functions/OrgNameToEndpoint.java | 57 --
.../vcloud_0_8/functions/OrgURIToEndpoint.java | 64 --
.../functions/OrgURIToKeysListEndpoint.java | 47 --
.../vcloud_0_8/functions/OrgsForLocations.java | 72 --
.../trmk/vcloud_0_8/functions/OrgsForNames.java | 54 --
.../ParseLoginResponseFromHeaders.java | 105 ---
.../functions/ParseTaskFromLocationHeader.java | 51 --
.../functions/VAppTemplatesForCatalogItems.java | 66 --
.../VAppTemplatesForResourceEntities.java | 67 --
.../VDCURIToInternetServicesEndpoint.java | 56 --
.../functions/VDCURIToPublicIPsEndpoint.java | 56 --
...rseTerremarkVCloudErrorFromHttpResponse.java | 109 ---
.../internal/TerremarkVCloudApiMetadata.java | 75 --
.../internal/TerremarkVCloudLoginApi.java | 40 -
.../internal/TerremarkVCloudVersionsApi.java | 35 -
.../trmk/vcloud_0_8/location/DefaultVDC.java | 73 --
.../location/OrgAndVDCToLocationSupplier.java | 92 ---
.../options/AddInternetServiceOptions.java | 94 ---
.../trmk/vcloud_0_8/options/AddNodeOptions.java | 75 --
.../vcloud_0_8/options/CloneVAppOptions.java | 98 ---
.../options/InstantiateVAppTemplateOptions.java | 477 -----------
.../trmk/vcloud_0_8/predicates/TaskSuccess.java | 64 --
.../reference/TerremarkConstants.java | 29 -
.../vcloud_0_8/reference/VCloudConstants.java | 55 --
.../trmk/vcloud_0_8/reference/package-info.java | 21 -
...ternetServiceAndPublicIpAddressSupplier.java | 32 -
...thNameMatchingConfigurationKeyOrDefault.java | 99 ---
.../org/jclouds/trmk/vcloud_0_8/util/Utils.java | 70 --
.../trmk/vcloud_0_8/util/VCloudUtils.java | 64 --
.../trmk/vcloud_0_8/xml/CatalogHandler.java | 75 --
.../trmk/vcloud_0_8/xml/CatalogItemHandler.java | 92 ---
.../xml/CustomizationParametersHandler.java | 60 --
.../trmk/vcloud_0_8/xml/DataCenterHandler.java | 65 --
.../trmk/vcloud_0_8/xml/DataCentersHandler.java | 71 --
.../trmk/vcloud_0_8/xml/ErrorHandler.java | 45 --
.../vcloud_0_8/xml/InternetServiceHandler.java | 110 ---
.../vcloud_0_8/xml/InternetServicesHandler.java | 87 --
.../trmk/vcloud_0_8/xml/IpAddressesHandler.java | 91 ---
.../vcloud_0_8/xml/KeyPairByNameHandler.java | 79 --
.../trmk/vcloud_0_8/xml/KeyPairHandler.java | 74 --
.../trmk/vcloud_0_8/xml/KeyPairsHandler.java | 69 --
.../xml/NetworkExtendedInfoHandler.java | 84 --
.../trmk/vcloud_0_8/xml/NetworkHandler.java | 93 ---
.../trmk/vcloud_0_8/xml/NodeHandler.java | 77 --
.../trmk/vcloud_0_8/xml/NodesHandler.java | 69 --
.../jclouds/trmk/vcloud_0_8/xml/OrgHandler.java | 90 ---
.../trmk/vcloud_0_8/xml/OrgListHandler.java | 54 --
.../vcloud_0_8/xml/PublicIpAddressHandler.java | 67 --
.../xml/PublicIpAddressesHandler.java | 69 --
.../xml/SupportedVersionsHandler.java | 59 --
.../trmk/vcloud_0_8/xml/TaskHandler.java | 126 ---
.../trmk/vcloud_0_8/xml/TasksListHandler.java | 74 --
.../vcloud_0_8/xml/VAppExtendedInfoHandler.java | 116 ---
.../trmk/vcloud_0_8/xml/VAppHandler.java | 142 ----
.../vcloud_0_8/xml/VAppTemplateHandler.java | 67 --
.../jclouds/trmk/vcloud_0_8/xml/VDCHandler.java | 95 ---
.../main/resources/ConfigureInternetService.xml | 22 -
.../main/resources/CreateInternetService.xml | 28 -
common/trmk/src/main/resources/CreateKey.xml | 23 -
.../src/main/resources/CreateNodeService.xml | 26 -
.../trmk/vcloud_0_8/TerremarkApiLiveTest.java | 795 -------------------
.../BindAddInternetServiceToXmlPayloadTest.java | 117 ---
.../BindAddNodeServiceToXmlPayloadTest.java | 77 --
.../BindCloneVAppParamsToXmlPayloadTest.java | 83 --
...tiateVAppTemplateParamsToXmlPayloadTest.java | 89 ---
.../BindNodeConfigurationToXmlPayloadTest.java | 95 ---
.../BindVAppConfigurationToXmlPayloadTest.java | 186 -----
.../TerremarkVCloudComputeClientTest.java | 123 ---
.../TerremarkVCloudTemplateOptionsTest.java | 229 ------
...rkVCloudComputeServiceContextModuleTest.java | 37 -
.../compute/strategy/CleanupOrphanKeysTest.java | 192 -----
...KeyPairUnlessUserSpecifiedOtherwiseTest.java | 171 ----
.../compute/strategy/DeleteKeyPairTest.java | 137 ----
...aultLoginCredentialsForVAppTemplateTest.java | 117 ---
.../suppliers/VAppTemplatesInOrgsLiveTest.java | 74 --
.../filters/SetVCloudTokenCookieTest.java | 54 --
.../ParseLoginResponseFromHeadersTest.java | 147 ----
...erremarkVCloudErrorFromHttpResponseTest.java | 105 ---
.../vcloud_0_8/internal/BasePayloadTest.java | 40 -
.../internal/BaseTerremarkApiLiveTest.java | 70 --
.../internal/TerremarkVCloudLoginApiTest.java | 99 ---
.../TerremarkVCloudVersionsApiTest.java | 70 --
.../options/AddInternetServiceOptionsTest.java | 65 --
.../vcloud_0_8/options/AddNodeOptionsTest.java | 65 --
.../InstantiateVAppTemplateOptionsTest.java | 155 ----
...meMatchingConfigurationKeyOrDefaultTest.java | 115 ---
.../trmk/vcloud_0_8/xml/CatalogHandlerTest.java | 141 ----
.../vcloud_0_8/xml/CatalogItemHandlerTest.java | 86 --
.../xml/CustomizationParametersHandlerTest.java | 46 --
.../vcloud_0_8/xml/DataCenterHandlerTest.java | 45 --
.../vcloud_0_8/xml/DataCentersHandlerTest.java | 50 --
.../xml/InternetServiceHandlerTest.java | 66 --
.../xml/InternetServicesHandlerTest.java | 60 --
.../vcloud_0_8/xml/IpAddressesHandlerTest.java | 49 --
.../xml/KeyPairByNameHandlerTest.java | 64 --
.../trmk/vcloud_0_8/xml/KeyPairHandlerTest.java | 65 --
.../trmk/vcloud_0_8/xml/KeysHandlerTest.java | 50 --
.../xml/NetworkExtendedInfoHandlerTest.java | 47 --
.../trmk/vcloud_0_8/xml/NetworkHandlerTest.java | 72 --
.../trmk/vcloud_0_8/xml/NodeHandlerTest.java | 46 --
.../trmk/vcloud_0_8/xml/NodesHandlerTest.java | 49 --
.../trmk/vcloud_0_8/xml/OrgHandlerTest.java | 83 --
.../trmk/vcloud_0_8/xml/OrgListHandlerTest.java | 49 --
.../xml/PublicIpAddressHandlerTest.java | 45 --
.../xml/PublicIpAddressesHandlerTest.java | 50 --
.../xml/ResourceAllocationHandlerTest.java | 57 --
.../xml/SupportedVersionsHandlerTest.java | 53 --
.../trmk/vcloud_0_8/xml/TaskHandlerTest.java | 95 ---
.../vcloud_0_8/xml/TasksListHandlerTest.java | 74 --
.../xml/VAppExtendedInfoHandlerTest.java | 76 --
.../trmk/vcloud_0_8/xml/VAppHandlerTest.java | 193 -----
.../vcloud_0_8/xml/VAppTemplateHandlerTest.java | 55 --
.../trmk/vcloud_0_8/xml/VDCHandlerTest.java | 79 --
.../vcloud_0_8/xml/ovf/SystemHandlerTest.java | 56 --
.../vcloud_0_8/xml/ovf/VAppHandlerTest.java | 182 -----
.../trmk/src/test/resources/ComputeOption.xml | 6 -
.../trmk/src/test/resources/ComputeOptions.xml | 13 -
.../CreateInternetService-options-test.xml | 29 -
.../resources/CreateInternetService-test.xml | 29 -
.../resources/CreateInternetService-test2.xml | 28 -
.../CreateNodeService-options-test.xml | 27 -
.../test/resources/CreateNodeService-test.xml | 27 -
.../test/resources/CreateNodeService-test2.xml | 26 -
.../test/resources/CustomizationParameters.xml | 6 -
...stantiateVAppTemplateParams-options-test.xml | 1 -
.../InstantiateVAppTemplateParams-test.xml | 1 -
.../trmk/src/test/resources/InternetService.xml | 16 -
.../src/test/resources/InternetService2.xml | 17 -
.../src/test/resources/InternetServices-2.xml | 155 ----
.../src/test/resources/InternetServices.xml | 20 -
common/trmk/src/test/resources/NodeService.xml | 11 -
common/trmk/src/test/resources/NodeServices.xml | 13 -
.../trmk/src/test/resources/PublicIpAddress.xml | 7 -
.../src/test/resources/PublicIpAddresses.xml | 15 -
.../src/test/resources/TerremarkNetwork.xml | 12 -
common/trmk/src/test/resources/catalog.xml | 27 -
.../test/resources/catalogItem-terremark.xml | 16 -
.../src/test/resources/cloneVApp-default.xml | 1 -
common/trmk/src/test/resources/cloneVApp.xml | 1 -
.../trmk/src/test/resources/configureVApp.xml | 1 -
.../trmk/src/test/resources/configureVApp4.xml | 1 -
.../src/test/resources/configureVAppAll.xml | 1 -
common/trmk/src/test/resources/datacenter.xml | 9 -
common/trmk/src/test/resources/datacenters.xml | 23 -
.../trmk/src/test/resources/ec_description.txt | 6 -
.../trmk/src/test/resources/ft_description.txt | 15 -
common/trmk/src/test/resources/get_vapp.xml | 250 ------
.../trmk/src/test/resources/get_vapp2disks.xml | 297 -------
.../src/test/resources/instantiatedvapp.xml | 9 -
common/trmk/src/test/resources/ipAddresses.xml | 13 -
common/trmk/src/test/resources/item.xml | 45 --
common/trmk/src/test/resources/key.xml | 16 -
common/trmk/src/test/resources/keysList.xml | 9 -
.../src/test/resources/lamp_description.txt | 8 -
.../trmk/src/test/resources/launched_vapp.xml | 8 -
common/trmk/src/test/resources/log4j.xml | 151 ----
.../src/test/resources/network-terremark.xml | 12 -
.../src/test/resources/newvapp-cpumemdisk.xml | 1 -
.../newvapp-networknamedhcpfencemode.xml | 1 -
common/trmk/src/test/resources/newvapp.xml | 1 -
common/trmk/src/test/resources/org.xml | 17 -
common/trmk/src/test/resources/orglist.xml | 3 -
.../src/test/resources/rhel_description.txt | 5 -
common/trmk/src/test/resources/system.xml | 43 -
common/trmk/src/test/resources/task-error.xml | 9 -
common/trmk/src/test/resources/task-self.xml | 11 -
common/trmk/src/test/resources/task.xml | 8 -
common/trmk/src/test/resources/taskslist.xml | 27 -
.../src/test/resources/vAppTemplate-trmk.xml | 7 -
common/trmk/src/test/resources/vapp-ext.xml | 21 -
common/trmk/src/test/resources/vapp.xml | 153 ----
common/trmk/src/test/resources/vapp2.xml | 170 ----
common/trmk/src/test/resources/vdc-nonet.xml | 22 -
common/trmk/src/test/resources/vdc.xml | 36 -
common/trmk/src/test/resources/versions.xml | 7 -
.../src/test/resources/windows_description.txt | 4 -
providers/pom.xml | 2 -
providers/trmk-ecloud/README.txt | 8 -
providers/trmk-ecloud/pom.xml | 133 ----
.../jclouds/trmk/ecloud/TerremarkECloudApi.java | 255 ------
.../trmk/ecloud/TerremarkECloudApiMetadata.java | 83 --
.../trmk/ecloud/TerremarkECloudMediaType.java | 120 ---
.../ecloud/TerremarkECloudProviderMetadata.java | 79 --
...remarkECloudComputeServiceContextModule.java | 38 -
...remarkECloudParseOsFromVAppTemplateName.java | 70 --
.../config/TerremarkECloudHttpApiModule.java | 100 ---
.../jclouds/trmk/ecloud/domain/ECloudOrg.java | 43 -
.../ecloud/domain/internal/ECloudOrgImpl.java | 64 --
.../features/DataCenterOperationsApi.java | 75 --
.../trmk/ecloud/features/TagOperationsApi.java | 68 --
.../OrgURIToDataCentersListEndpoint.java | 49 --
.../functions/OrgURIToTagsListEndpoint.java | 49 --
...ternetServiceAndPublicIpAddressSupplier.java | 89 ---
.../trmk/ecloud/xml/ECloudOrgHandler.java | 62 --
.../ecloud/xml/TagNameToUsageCountHandler.java | 59 --
.../org.jclouds.providers.ProviderMetadata | 1 -
.../ecloud/BaseTerremarkECloudApiLiveTest.java | 41 -
.../trmk/ecloud/BaseTerremarkECloudApiTest.java | 268 -------
.../trmk/ecloud/TerremarkECloudApiLiveTest.java | 69 --
.../trmk/ecloud/TerremarkECloudApiTest.java | 529 ------------
.../ecloud/TerremarkECloudClientMockTest.java | 114 ---
.../ecloud/TerremarkECloudProviderTest.java | 33 -
.../TerremarkECloudComputeServiceLiveTest.java | 120 ---
.../TerremarkECloudTemplateBuilderLiveTest.java | 93 ---
...rkECloudParseOsFromVAppTemplateNameTest.java | 170 ----
.../DataCenterOperationsApiLiveTest.java | 43 -
.../features/DataCenterOperationsApiTest.java | 79 --
.../features/TagOperationsApiLiveTest.java | 43 -
.../ecloud/features/TagOperationsApiTest.java | 78 --
.../trmk/ecloud/xml/ECloudOrgHandlerTest.java | 124 ---
.../xml/TagNameToUsageCountHandlerTest.java | 66 --
.../CreateInternetService-options-test.xml | 30 -
.../src/test/resources/catalog-ecloud.xml | 104 ---
.../src/test/resources/deviceTags.xml | 27 -
.../trmk-ecloud/src/test/resources/log4j.xml | 151 ----
.../src/test/resources/org-ecloud.xml | 12 -
providers/trmk-vcloudexpress/README.txt | 8 -
providers/trmk-vcloudexpress/pom.xml | 126 ---
.../TerremarkVCloudExpressApi.java | 113 ---
.../TerremarkVCloudExpressApiMetadata.java | 86 --
.../TerremarkVCloudExpressMediaType.java | 40 -
.../TerremarkVCloudExpressProviderMetadata.java | 80 --
...CloudExpressComputeServiceContextModule.java | 34 -
.../TerremarkVCloudExpressHttpApiModule.java | 44 -
...ternetServiceAndPublicIpAddressSupplier.java | 73 --
.../org.jclouds.providers.ProviderMetadata | 1 -
.../vcloudexpress/InternetServiceLiveTest.java | 102 ---
.../TerremarkVCloudExpressApiLiveTest.java | 52 --
.../TerremarkVCloudExpressApiTest.java | 779 ------------------
.../TerremarkVCloudExpressProviderTest.java | 33 -
...markVCloudExpressComputeServiceLiveTest.java | 111 ---
...arkVCloudExpressTemplateBuilderLiveTest.java | 80 --
.../src/test/resources/log4j.xml | 151 ----
354 files changed, 29187 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/allcompute/pom.xml
----------------------------------------------------------------------
diff --git a/allcompute/pom.xml b/allcompute/pom.xml
index 5904a93..16c0225 100644
--- a/allcompute/pom.xml
+++ b/allcompute/pom.xml
@@ -85,16 +85,6 @@
</dependency>
<dependency>
<groupId>org.apache.jclouds.provider</groupId>
- <artifactId>trmk-vcloudexpress</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.provider</groupId>
- <artifactId>trmk-ecloud</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.provider</groupId>
<artifactId>bluelock-vcloud-zone01</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index d0de34e..0d2966f 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -32,6 +32,5 @@
<modules>
<module>azure</module>
<module>openstack</module>
- <module>trmk</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/pom.xml
----------------------------------------------------------------------
diff --git a/common/trmk/pom.xml b/common/trmk/pom.xml
deleted file mode 100644
index 0c0cfb6..0000000
--- a/common/trmk/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
- <relativePath>../../project/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.jclouds.common</groupId>
- <artifactId>trmk-common</artifactId>
- <name>common Terremark components</name>
- <description>common Terremark components</description>
- <packaging>bundle</packaging>
-
- <properties>
- <jclouds.osgi.export>org.jclouds.trmk.vcloud_0_8*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
- </properties>
-
-
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.jamesmurty.utils</groupId>
- <artifactId>java-xmlbuilder</artifactId>
- <version>0.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudApi.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudApi.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudApi.java
deleted file mode 100644
index 0c4e48e..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudApi.java
+++ /dev/null
@@ -1,576 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloud_0_8;
-
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.CATALOGITEMCUSTOMIZATIONPARAMETERS_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.CATALOGITEM_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.CATALOG_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.INTERNETSERVICESLIST_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.INTERNETSERVICE_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.NETWORK_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.NODESERVICE_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.ORG_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.PUBLICIPSLIST_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.PUBLICIP_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.TASKSLIST_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.TASK_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.VAPPTEMPLATE_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.VAPP_XML;
-import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.VDC_XML;
-
-import java.io.Closeable;
-import java.net.URI;
-import java.util.Map;
-import java.util.Set;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.Fallbacks;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.predicates.validators.DnsNameValidator;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.MapBinder;
-import org.jclouds.rest.annotations.ParamValidators;
-import org.jclouds.rest.annotations.PayloadParam;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.rest.annotations.XMLResponseParser;
-import org.jclouds.trmk.vcloud_0_8.binders.BindCloneVAppParamsToXmlPayload;
-import org.jclouds.trmk.vcloud_0_8.binders.BindInstantiateVAppTemplateParamsToXmlPayload;
-import org.jclouds.trmk.vcloud_0_8.binders.BindNodeConfigurationToXmlPayload;
-import org.jclouds.trmk.vcloud_0_8.binders.BindVAppConfigurationToXmlPayload;
-import org.jclouds.trmk.vcloud_0_8.binders.OrgNameAndCatalogNameToEndpoint;
-import org.jclouds.trmk.vcloud_0_8.binders.OrgNameAndTasksListNameToEndpoint;
-import org.jclouds.trmk.vcloud_0_8.binders.OrgNameAndVDCNameToEndpoint;
-import org.jclouds.trmk.vcloud_0_8.binders.OrgNameCatalogNameItemNameToEndpoint;
-import org.jclouds.trmk.vcloud_0_8.binders.OrgNameCatalogNameVAppTemplateNameToEndpoint;
-import org.jclouds.trmk.vcloud_0_8.binders.OrgNameVDCNameResourceEntityNameToEndpoint;
-import org.jclouds.trmk.vcloud_0_8.domain.Catalog;
-import org.jclouds.trmk.vcloud_0_8.domain.CatalogItem;
-import org.jclouds.trmk.vcloud_0_8.domain.CustomizationParameters;
-import org.jclouds.trmk.vcloud_0_8.domain.InternetService;
-import org.jclouds.trmk.vcloud_0_8.domain.KeyPair;
-import org.jclouds.trmk.vcloud_0_8.domain.Network;
-import org.jclouds.trmk.vcloud_0_8.domain.Node;
-import org.jclouds.trmk.vcloud_0_8.domain.Protocol;
-import org.jclouds.trmk.vcloud_0_8.domain.PublicIpAddress;
-import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
-import org.jclouds.trmk.vcloud_0_8.domain.Task;
-import org.jclouds.trmk.vcloud_0_8.domain.TasksList;
-import org.jclouds.trmk.vcloud_0_8.domain.VApp;
-import org.jclouds.trmk.vcloud_0_8.domain.VAppConfiguration;
-import org.jclouds.trmk.vcloud_0_8.domain.VAppTemplate;
-import org.jclouds.trmk.vcloud_0_8.domain.VDC;
-import org.jclouds.trmk.vcloud_0_8.filters.SetVCloudTokenCookie;
-import org.jclouds.trmk.vcloud_0_8.functions.OrgNameToEndpoint;
-import org.jclouds.trmk.vcloud_0_8.functions.ParseTaskFromLocationHeader;
-import org.jclouds.trmk.vcloud_0_8.functions.VDCURIToInternetServicesEndpoint;
-import org.jclouds.trmk.vcloud_0_8.functions.VDCURIToPublicIPsEndpoint;
-import org.jclouds.trmk.vcloud_0_8.options.AddInternetServiceOptions;
-import org.jclouds.trmk.vcloud_0_8.options.AddNodeOptions;
-import org.jclouds.trmk.vcloud_0_8.options.CloneVAppOptions;
-import org.jclouds.trmk.vcloud_0_8.options.InstantiateVAppTemplateOptions;
-import org.jclouds.trmk.vcloud_0_8.xml.CatalogHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.CatalogItemHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.CustomizationParametersHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.InternetServiceHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.InternetServicesHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.NetworkHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.NodeHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.NodesHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.OrgHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.PublicIpAddressesHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.TaskHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.TasksListHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.VAppHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.VAppTemplateHandler;
-import org.jclouds.trmk.vcloud_0_8.xml.VDCHandler;
-
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.inject.Provides;
-
-/**
- * Provides access to VCloud resources via their REST API.
- * <p/>
- *
- * @see <a href=
- * "https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx"
- * />
- * @author Adrian Cole
- */
-@RequestFilters(SetVCloudTokenCookie.class)
-public interface TerremarkVCloudApi extends Closeable {
- @GET
- @XMLResponseParser(CatalogHandler.class)
- @Consumes(CATALOG_XML)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- Catalog getCatalog(@EndpointParam URI catalogId);
-
- /**
- * returns the catalog in the organization associated with the specified
- * name. Note that both parameters can be null to choose default.
- *
- * @param orgName
- * organization name, or null for the default
- * @param catalogName
- * catalog name, or null for the default
- * @throws NoSuchElementException
- * if you specified an org or catalog name that isn't present
- */
- @GET
- @XMLResponseParser(CatalogHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- @Consumes(CATALOG_XML)
- @MapBinder(OrgNameAndCatalogNameToEndpoint.class)
- Catalog findCatalogInOrgNamed(@Nullable @PayloadParam("orgName") String orgName,
- @Nullable @PayloadParam("catalogName") String catalogName);
-
- @GET
- @Consumes(CATALOGITEM_XML)
- @XMLResponseParser(CatalogItemHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- CatalogItem getCatalogItem(@EndpointParam URI catalogItem);
-
- /**
- * returns the catalog item in the catalog associated with the specified
- * name. Note that the org and catalog parameters can be null to choose
- * default.
- *
- * @param orgName
- * organization name, or null for the default
- * @param catalogName
- * catalog name, or null for the default
- * @param itemName
- * item you wish to lookup
- *
- * @throws NoSuchElementException
- * if you specified an org, catalog, or catalog item name that
- * isn't present
- */
- @GET
- @Consumes(CATALOGITEM_XML)
- @XMLResponseParser(CatalogItemHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- @MapBinder(OrgNameCatalogNameItemNameToEndpoint.class)
- CatalogItem findCatalogItemInOrgCatalogNamed(@Nullable @PayloadParam("orgName") String orgName,
- @Nullable @PayloadParam("catalogName") String catalogName, @PayloadParam("itemName") String itemName);
-
- @GET
- @Consumes(NETWORK_XML)
- @XMLResponseParser(NetworkHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- @MapBinder(OrgNameVDCNameResourceEntityNameToEndpoint.class)
- Network findNetworkInOrgVDCNamed(@Nullable @PayloadParam("orgName") String orgName,
- @Nullable @PayloadParam("vdcName") String vdcName, @PayloadParam("resourceName") String networkName);
-
- @GET
- @Consumes(NETWORK_XML)
- @XMLResponseParser(NetworkHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- Network getNetwork(@EndpointParam URI network);
-
- /**
- * returns the VDC in the organization associated with the specified name.
- * Note that both parameters can be null to choose default.
- *
- * @param orgName
- * organization name, or null for the default
- * @param vdcName
- * catalog name, or null for the default
- * @throws NoSuchElementException
- * if you specified an org or vdc name that isn't present
- */
- @GET
- @XMLResponseParser(VDCHandler.class)
- @Consumes(VDC_XML)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- @MapBinder(OrgNameAndVDCNameToEndpoint.class)
- VDC findVDCInOrgNamed(@Nullable @PayloadParam("orgName") String orgName,
- @Nullable @PayloadParam("vdcName") String vdcName);
-
- @GET
- @Consumes(TASKSLIST_XML)
- @XMLResponseParser(TasksListHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- TasksList getTasksList(@EndpointParam URI tasksListId);
-
- @GET
- @XMLResponseParser(TasksListHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- @Consumes(TASKSLIST_XML)
- @MapBinder(OrgNameAndTasksListNameToEndpoint.class)
- TasksList findTasksListInOrgNamed(@Nullable @PayloadParam("orgName") String orgName,
- @Nullable @PayloadParam("tasksListName") String tasksListName);
-
- /**
- * Whenever the result of a request cannot be returned immediately, the
- * server creates a Task object and includes it in the response, as a member
- * of the Tasks container in the response body. Each Task has an href value,
- * which is a URL that the client can use to retrieve the Task element alone,
- * without the rest of the response in which it was contained. All
- * information about the task is included in the Task element when it is
- * returned in the response's Tasks container, so a client does not need to
- * make an additional request to the Task URL unless it wants to follow the
- * progress of a task that was incomplete.
- */
- @GET
- @Consumes(TASK_XML)
- @XMLResponseParser(TaskHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- Task getTask(@EndpointParam URI taskId);
-
- @POST
- @Path("/action/cancel")
- void cancelTask(@EndpointParam URI taskId);
-
- /**
- *
- * @return a listing of all orgs that the current user has access to.
- */
- @Provides
- @org.jclouds.trmk.vcloud_0_8.endpoints.Org
- Map<String, ReferenceType> listOrgs();
-
- @POST
- @Path("/action/instantiateVAppTemplate")
- @Produces("application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml")
- @Consumes(VAPP_XML)
- @XMLResponseParser(VAppHandler.class)
- @MapBinder(BindInstantiateVAppTemplateParamsToXmlPayload.class)
- VApp instantiateVAppTemplateInVDC(@EndpointParam URI vdc,
- @PayloadParam("template") URI template,
- @PayloadParam("name") @ParamValidators(DnsNameValidator.class) String appName,
- InstantiateVAppTemplateOptions... options);
-
- @POST
- @Path("/action/cloneVApp")
- @Produces("application/vnd.vmware.vcloud.cloneVAppParams+xml")
- @Consumes(TASK_XML)
- @XMLResponseParser(TaskHandler.class)
- @MapBinder(BindCloneVAppParamsToXmlPayload.class)
- Task cloneVAppInVDC(@EndpointParam URI vdc, @PayloadParam("vApp") URI toClone,
- @PayloadParam("newName") @ParamValidators(DnsNameValidator.class) String newName, CloneVAppOptions... options);
-
- @GET
- @Consumes(VAPPTEMPLATE_XML)
- @XMLResponseParser(VAppTemplateHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- VAppTemplate getVAppTemplate(@EndpointParam URI vAppTemplate);
-
- /**
- * returns the vapp template corresponding to a catalog item in the catalog
- * associated with the specified name. Note that the org and catalog
- * parameters can be null to choose default.
- *
- * @param orgName
- * organization name, or null for the default
- * @param catalogName
- * catalog name, or null for the default
- * @param itemName
- * item you wish to lookup
- *
- * @throws NoSuchElementException
- * if you specified an org, catalog, or catalog item name that
- * isn't present
- */
- @GET
- @Consumes(VAPPTEMPLATE_XML)
- @XMLResponseParser(VAppTemplateHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- @MapBinder(OrgNameCatalogNameVAppTemplateNameToEndpoint.class)
- VAppTemplate findVAppTemplateInOrgCatalogNamed(@Nullable @PayloadParam("orgName") String orgName,
- @Nullable @PayloadParam("catalogName") String catalogName, @PayloadParam("itemName") String itemName);
-
- @GET
- @Consumes(VAPP_XML)
- @XMLResponseParser(VAppHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- @MapBinder(OrgNameVDCNameResourceEntityNameToEndpoint.class)
- VApp findVAppInOrgVDCNamed(@Nullable @PayloadParam("orgName") String orgName,
- @Nullable @PayloadParam("vdcName") String vdcName, @PayloadParam("resourceName") String vAppName);
-
- @GET
- @Consumes(VAPP_XML)
- @XMLResponseParser(VAppHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- VApp getVApp(@EndpointParam URI vApp);
-
- @POST
- @Consumes(TASK_XML)
- @Path("/action/deploy")
- @XMLResponseParser(TaskHandler.class)
- Task deployVApp(@EndpointParam URI vAppId);
-
- /**
- *
- */
- @POST
- @Consumes(TASK_XML)
- @Path("/action/undeploy")
- @XMLResponseParser(TaskHandler.class)
- Task undeployVApp(@EndpointParam URI vAppId);
-
- /**
- * This call powers on the vApp, as specified in the vApp's ovf:Startup
- * element.
- */
- @POST
- @Consumes(TASK_XML)
- @Path("/power/action/powerOn")
- @XMLResponseParser(TaskHandler.class)
- Task powerOnVApp(@EndpointParam URI vAppId);
-
- /**
- * This call powers off the vApp, as specified in the vApp's ovf:Startup
- * element.
- */
- @POST
- @Consumes(TASK_XML)
- @Path("/power/action/powerOff")
- @XMLResponseParser(TaskHandler.class)
- Task powerOffVApp(@EndpointParam URI vAppId);
-
- /**
- * This call shuts down the vApp.
- */
- @POST
- @Path("/power/action/shutdown")
- void shutdownVApp(@EndpointParam URI vAppId);
-
- /**
- * This call resets the vApp.
- */
- @POST
- @Consumes(TASK_XML)
- @Path("/power/action/reset")
- @XMLResponseParser(TaskHandler.class)
- Task resetVApp(@EndpointParam URI vAppId);
-
- /**
- * This call suspends the vApp.
- */
- @POST
- @Consumes(TASK_XML)
- @Path("/power/action/suspend")
- @XMLResponseParser(TaskHandler.class)
- Task suspendVApp(@EndpointParam URI vAppId);
-
- @DELETE
- @ResponseParser(ParseTaskFromLocationHeader.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- Task deleteVApp(@EndpointParam URI vAppId);
-
- /**
- * {@inheritDoc}
- */
- @GET
- @XMLResponseParser(VDCHandler.class)
- @Consumes(VDC_XML)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- VDC getVDC(@EndpointParam URI vdc);
-
- @GET
- @XMLResponseParser(OrgHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- @Consumes(ORG_XML)
- org.jclouds.trmk.vcloud_0_8.domain.Org getOrg(@EndpointParam URI orgId);
-
- @GET
- @XMLResponseParser(OrgHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- @Consumes(ORG_XML)
- org.jclouds.trmk.vcloud_0_8.domain.Org findOrgNamed(
- @Nullable @EndpointParam(parser = OrgNameToEndpoint.class) String orgName);
-
- @GET
- @XMLResponseParser(CustomizationParametersHandler.class)
- @Consumes(CATALOGITEMCUSTOMIZATIONPARAMETERS_XML)
- CustomizationParameters getCustomizationOptions(@EndpointParam URI customization);
-
- /**
- * This call returns a list of public IP addresses.
- */
- @GET
- @Consumes(PUBLICIPSLIST_XML)
- @XMLResponseParser(PublicIpAddressesHandler.class)
- @Fallback(Fallbacks.EmptySetOnNotFoundOr404.class)
- Set<PublicIpAddress> getPublicIpsAssociatedWithVDC(
- @EndpointParam(parser = VDCURIToPublicIPsEndpoint.class) URI vDCId);
-
- @DELETE
- @Fallback(TerremarkVCloudFallbacks.VoidOnDeleteDefaultIp.class)
- void deletePublicIp(@EndpointParam URI ipId);
-
- /**
- * This call adds an internet service to a known, existing public IP. This
- * call is identical to Add Internet Service except you specify the public IP
- * in the request.
- *
- */
- @POST
- @Path("/internetServices")
- @Produces(INTERNETSERVICE_XML)
- @Consumes(INTERNETSERVICE_XML)
- @XMLResponseParser(InternetServiceHandler.class)
- @MapBinder(AddInternetServiceOptions.class)
- InternetService addInternetServiceToExistingIp(@EndpointParam URI publicIpId,
- @PayloadParam("name") String serviceName, @PayloadParam("protocol") Protocol protocol,
- @PayloadParam("port") int port, AddInternetServiceOptions... options);
-
- @DELETE
- @Fallback(Fallbacks.VoidOnNotFoundOr404.class)
- void deleteInternetService(@EndpointParam URI internetServiceId);
-
- @GET
- @Consumes(INTERNETSERVICESLIST_XML)
- @XMLResponseParser(InternetServiceHandler.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- InternetService getInternetService(@EndpointParam URI internetServiceId);
-
- @GET
- @Consumes(INTERNETSERVICESLIST_XML)
- @XMLResponseParser(InternetServicesHandler.class)
- @Fallback(Fallbacks.EmptySetOnNotFoundOr404.class)
- Set<InternetService> getAllInternetServicesInVDC(
- @EndpointParam(parser = VDCURIToInternetServicesEndpoint.class) URI vDCId);
-
- /**
- * This call returns information about the internet service on a public IP.
- */
- @GET
- @Path("/internetServices")
- @Consumes(INTERNETSERVICESLIST_XML)
- @XMLResponseParser(InternetServicesHandler.class)
- @Fallback(Fallbacks.EmptySetOnNotFoundOr404.class)
- Set<InternetService> getInternetServicesOnPublicIp(@EndpointParam URI ipId);
-
- @GET
- @Consumes(PUBLICIP_XML)
- @XMLResponseParser(InternetServicesHandler.class)
- @Fallback(Fallbacks.EmptySetOnNotFoundOr404.class)
- Set<InternetService> getPublicIp(@EndpointParam URI ipId);
-
- /**
- * This call adds a node to an existing internet service.
- * <p/>
- * Every vDC is assigned a network of 60 IP addresses that can be used as
- * nodes. Each node can associated with multiple internet service. You can
- * get a list of the available IP addresses by calling Get IP Addresses for a
- * Network.
- *
- * @param internetServiceId
- * @param ipAddress
- * @param name
- * @param port
- * @param options
- * @return
- */
- @POST
- @Path("/nodeServices")
- @Produces(NODESERVICE_XML)
- @Consumes(NODESERVICE_XML)
- @XMLResponseParser(NodeHandler.class)
- @MapBinder(AddNodeOptions.class)
- Node addNode(@EndpointParam URI internetServiceId,
- @PayloadParam("ipAddress") String ipAddress, @PayloadParam("name") String name,
- @PayloadParam("port") int port, AddNodeOptions... options);
-
- @GET
- @XMLResponseParser(NodeHandler.class)
- @Consumes(NODESERVICE_XML)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- Node getNode(@EndpointParam URI nodeId);
-
- @PUT
- @Produces(NODESERVICE_XML)
- @Consumes(NODESERVICE_XML)
- @XMLResponseParser(NodeHandler.class)
- @MapBinder(BindNodeConfigurationToXmlPayload.class)
- Node configureNode(@EndpointParam URI nodeId, @PayloadParam("name") String name,
- @PayloadParam("enabled") boolean enabled, @Nullable @PayloadParam("description") String description);
-
- @DELETE
- @Fallback(Fallbacks.VoidOnNotFoundOr404.class)
- void deleteNode(@EndpointParam URI nodeId);
-
- @GET
- @Path("/nodeServices")
- @XMLResponseParser(NodesHandler.class)
- @Fallback(Fallbacks.EmptySetOnNotFoundOr404.class)
- @Consumes(NODESERVICE_XML)
- Set<Node> getNodes(@EndpointParam URI internetServiceId);
-
- /**
- * This call configures the settings of an existing vApp by passing the new
- * configuration. The existing vApp must be in a powered off state (status =
- * 2).
- * <p/>
- * You can change the following items for a vApp.
- * <ol>
- * <li>vApp name Number of virtual CPUs</li>
- * <li>Amount of virtual memory</li>
- * <li>Add a virtual disk</li>
- * <li>Delete a virtual disk</li>
- * </ol>
- * You can make more than one change in a single request. For example, you
- * can increase the number of virtual CPUs and the amount of virtual memory
- * in the same request.
- *
- * @param VApp
- * vApp to change in power state off
- * @param configuration
- * (s) to change
- * @return task of configuration change
- */
- @PUT
- @Produces(VAPP_XML)
- @Consumes(VAPP_XML)
- @MapBinder(BindVAppConfigurationToXmlPayload.class)
- @ResponseParser(ParseTaskFromLocationHeader.class)
- Task configureVApp(
- @EndpointParam(parser = BindVAppConfigurationToXmlPayload.class) VApp vApp, VAppConfiguration configuration);
-
- /**
- */
- Set<KeyPair> listKeyPairsInOrg(URI org);
-
- /**
- * @throws IllegalStateException
- * if a key of the same name already exists
- */
- KeyPair generateKeyPairInOrg(URI org, String name, boolean makeDefault);
-
- /**
- */
- KeyPair findKeyPairInOrg(URI org, String keyPairName);
-
- KeyPair getKeyPair(URI keyPair);
-
- // TODO
- // KeyPair configureKeyPair(int keyPairId, KeyPairConfiguration
- // keyPairConfiguration);
-
- void deleteKeyPair(URI keyPair);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudFallbacks.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudFallbacks.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudFallbacks.java
deleted file mode 100644
index 0f2cac9..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudFallbacks.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloud_0_8;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Throwables.propagate;
-import static com.google.common.util.concurrent.Futures.immediateFuture;
-
-import java.util.regex.Pattern;
-
-import org.jclouds.Fallback;
-import org.jclouds.http.HttpResponseException;
-import org.jclouds.rest.AuthorizationException;
-
-import com.google.common.util.concurrent.ListenableFuture;
-
-public final class TerremarkVCloudFallbacks {
- private TerremarkVCloudFallbacks() {
- }
-
- /**
- * There's no current way to determine if an IP is the default outbound one. In this case, we may get errors on
- * deleting an IP, which are ok.
- *
- * @author Adrian Cole
- */
- public static final class VoidOnDeleteDefaultIp implements Fallback<Void> {
- public static final Pattern MESSAGE_PATTERN = Pattern
- .compile(".*Cannot release this Public IP as it is default oubound IP.*");
-
- @Override
- public ListenableFuture<Void> create(Throwable t) throws Exception {
- return immediateFuture(createOrPropagate(t));
- }
-
- @Override
- public Void createOrPropagate(Throwable t) throws Exception {
- if (checkNotNull(t, "throwable") instanceof HttpResponseException) {
- HttpResponseException hre = HttpResponseException.class.cast(t);
- if (hre.getResponse().getStatusCode() == 503 || hre.getResponse().getStatusCode() == 401
- || MESSAGE_PATTERN.matcher(hre.getMessage()).matches())
- return null;
- } else if (t instanceof AuthorizationException) {
- return null;
- }
- throw propagate(t);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudMediaType.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudMediaType.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudMediaType.java
deleted file mode 100644
index c40cac9..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudMediaType.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloud_0_8;
-
-import javax.ws.rs.core.MediaType;
-
-/**
- * Resource Types used in Terremark VCloud
- *
- * @see MediaType
- */
-public interface TerremarkVCloudMediaType {
- /**
- * "application/vnd.vmware.vcloud.error+xml"
- */
- public static final String ERROR_XML = "application/vnd.vmware.vcloud.error+xml";
-
- /**
- * "application/vnd.vmware.vcloud.error+xml"
- */
- public static final MediaType ERROR_XML_TYPE = new MediaType("application", "vnd.vmware.vcloud.error+xml");
-
- /**
- * "application/vnd.vmware.vcloud.vcloud+xml"
- */
- public static final String VCLOUD_XML = "application/vnd.vmware.vcloud.vcloud+xml";
-
- /**
- * "application/vnd.vmware.vcloud.vcloud+xml"
- */
- public static final MediaType VCLOUD_XML_TYPE = new MediaType("application", "vnd.vmware.vcloud.vcloud+xml");
- /**
- * "application/vnd.vmware.vcloud.org+xml"
- */
- public static final String ORG_XML = "application/vnd.vmware.vcloud.org+xml";
- /**
- * "application/vnd.vmware.vcloud.org+xml"
- */
- public static final MediaType ORG_XML_TYPE = new MediaType("application", "vnd.vmware.vcloud.org+xml");
-
- /**
- * "application/vnd.vmware.vcloud.vdc+xml"
- */
- public static final String VDC_XML = "application/vnd.vmware.vcloud.vdc+xml";
- /**
- * "application/vnd.vmware.vcloud.vdc+xml"
- */
- public static final MediaType VDC_XML_TYPE = new MediaType("application", "vnd.vmware.vcloud.vdc+xml");
-
- /**
- * "application/vnd.vmware.vcloud.catalog+xml"
- */
- public static final String CATALOG_XML = "application/vnd.vmware.vcloud.catalog+xml";
- /**
- * "application/vnd.vmware.vcloud.catalog+xml"
- */
- public static final MediaType CATALOG_XML_TYPE = new MediaType("application", "vnd.vmware.vcloud.catalog+xml");
-
- /**
- * "application/vnd.vmware.vcloud.tasksList+xml"
- */
- public static final String TASKSLIST_XML = "application/vnd.vmware.vcloud.tasksList+xml";
- /**
- * "application/vnd.vmware.vcloud.tasksList+xml"
- */
- public static final MediaType TASKSLIST_XML_TYPE = new MediaType("application", "vnd.vmware.vcloud.tasksList+xml");
-
- /**
- * "application/vnd.vmware.vcloud.catalogItem+xml"
- */
- public static final String CATALOGITEM_XML = "application/vnd.vmware.vcloud.catalogItem+xml";
- /**
- * "application/vnd.vmware.vcloud.catalogItem+xml"
- */
- public static final MediaType CATALOGITEM_XML_TYPE = new MediaType("application",
- "vnd.vmware.vcloud.catalogItem+xml");
- /**
- * "application/vnd.vmware.vcloud.networkConnectionSection+xml"
- */
- public static final String NETWORKCONNECTIONSECTION_XML = "application/vnd.vmware.vcloud.networkConnectionSection+xml";
- /**
- * "application/vnd.vmware.vcloud.networkConnectionSection+xml"
- */
- public static final MediaType NETWORKCONNECTIONSECTION_XML_TYPE = new MediaType("application",
- "vnd.vmware.vcloud.networkConnectionSection+xml");
- /**
- * "application/vnd.vmware.vcloud.virtualHardwareSection+xml"
- */
- public static final String VIRTUALHARDWARESECTION_XML = "application/vnd.vmware.vcloud.virtualHardwareSection+xml";
- /**
- * "application/vnd.vmware.vcloud.virtualHardwareSection+xml"
- */
- public static final MediaType VIRTUALHARDWARESECTION_XML_TYPE = new MediaType("application",
- "vnd.vmware.vcloud.virtualHardwareSection+xml");
- /**
- * "application/vnd.vmware.vcloud.guestCustomizationSection+xml"
- */
- public static final String GUESTCUSTOMIZATIONSECTION_XML = "application/vnd.vmware.vcloud.guestCustomizationSection+xml";
- /**
- * "application/vnd.vmware.vcloud.guestCustomizationSection+xml"
- */
- public static final MediaType GUESTCUSTOMIZATIONSECTION_XML_TYPE = new MediaType("application",
- "vnd.vmware.vcloud.guestCustomizationSection+xml");
-
- /**
- * "application/vnd.vmware.vcloud.networkSection+xml"
- */
- public static final String NETWORKSECTION_XML = "application/vnd.vmware.vcloud.networkSection+xml";
- /**
- * "application/vnd.vmware.vcloud.networkSection+xml"
- */
- public static final MediaType NETWORKSECTION_XML_TYPE = new MediaType("application",
- "vnd.vmware.vcloud.networkSection+xml");
-
- /**
- * "application/vnd.vmware.vcloud.task+xml"
- */
- public static final String TASK_XML = "application/vnd.vmware.vcloud.task+xml";
- /**
- * "application/vnd.vmware.vcloud.task+xml"
- */
- public static final MediaType TASK_XML_TYPE = new MediaType("application", "vnd.vmware.vcloud.task+xml");
-
- /**
- * "application/vnd.vmware.vcloud.undeployVAppParams+xml"
- */
- public static final String UNDEPLOYVAPPPARAMS_XML = "application/vnd.vmware.vcloud.undeployVAppParams+xml";
- /**
- * "application/vnd.vmware.vcloud.undeployVAppParams+xml"
- */
- public static final MediaType UNDEPLOYVAPPPARAMS_XML_TYPE = new MediaType("application",
- "vnd.vmware.vcloud.undeployVAppParams+xml");
-
- /**
- * "application/vnd.vmware.vcloud.deployVAppParams+xml"
- */
- public static final String DEPLOYVAPPPARAMS_XML = "application/vnd.vmware.vcloud.deployVAppParams+xml";
- /**
- * "application/vnd.vmware.vcloud.deployVAppParams+xml"
- */
- public static final MediaType DEPLOYVAPPPARAMS_XML_TYPE = new MediaType("application",
- "vnd.vmware.vcloud.deployVAppParams+xml");
-
- /**
- * "application/vnd.vmware.vcloud.vApp+xml"
- */
- public static final String VAPP_XML = "application/vnd.vmware.vcloud.vApp+xml";
- /**
- * "application/vnd.vmware.vcloud.vApp+xml"
- */
- public static final MediaType VAPP_XML_TYPE = new MediaType("application", "vnd.vmware.vcloud.vApp+xml");
-
- /**
- * "application/vnd.vmware.vcloud.vm+xml"
- */
- public static final String VM_XML = "application/vnd.vmware.vcloud.vm+xml";
- /**
- * "application/vnd.vmware.vcloud.vm+xml"
- */
- public static final MediaType VM_XML_TYPE = new MediaType("application", "vnd.vmware.vcloud.vm+xml");
-
- /**
- * "application/vnd.vmware.vcloud.vAppTemplate+xml"
- */
- public static final String VAPPTEMPLATE_XML = "application/vnd.vmware.vcloud.vAppTemplate+xml";
- /**
- * "application/vnd.vmware.vcloud.vAppTemplate+xml"
- */
- public static final MediaType VAPPTEMPLATE_XML_TYPE = new MediaType("application",
- "vnd.vmware.vcloud.vAppTemplate+xml");
- /**
- * "application/vnd.vmware.vcloud.network+xml"
- */
- public static final String NETWORK_XML = "application/vnd.vmware.vcloud.network+xml";
- /**
- * "application/vnd.vmware.vcloud.network+xml"
- */
- public static final MediaType NETWORK_XML_TYPE = new MediaType("application", "vnd.vmware.vcloud.network+xml");
-
- /**
- * "application/vnd.vmware.vcloud.rasdItem+xml"
- */
- public static final String RASDITEM_XML = "application/vnd.vmware.vcloud.rasdItem+xml";
- /**
- * "application/vnd.vmware.vcloud.rasdItem+xml"
- */
- public static final MediaType RASDITEM_XML_TYPE = new MediaType("application", "vnd.vmware.vcloud.rasdItem+xml");
-
- /**
- * "application/vnd.vmware.vcloud.organizationList+xml"
- */
- public static final String ORGLIST_XML = "application/vnd.vmware.vcloud.orgList+xml";
-
- /**
- * "application/vnd.vmware.vcloud.organizationList+xml"
- */
- public static final MediaType ORGLIST_XML_TYPE = new MediaType("application",
- "vnd.vmware.vcloud.orgList+xml");
-
- /**
- * "application/vnd.tmrk.vCloud.publicIp+xml"
- */
- public static final String PUBLICIP_XML = "application/vnd.tmrk.vCloud.publicIp+xml";
-
- /**
- * "application/vnd.tmrk.vCloud.publicIp+xml"
- */
- public static final MediaType PUBLICIP_XML_TYPE = new MediaType("application", "vnd.tmrk.vCloud.publicIp+xml");
-
- /**
- * "application/vnd.tmrk.vCloud.publicIpsList+xml"
- */
- public static final String PUBLICIPSLIST_XML = "application/vnd.tmrk.vCloud.publicIpsList+xml";
-
- /**
- * "application/vnd.tmrk.vCloud.publicIpsList+xml"
- */
- public static final MediaType PUBLICIPSLIST_XML_TYPE = new MediaType("application",
- "vnd.tmrk.vCloud.publicIpsList+xml");
-
- /**
- * "application/vnd.tmrk.vCloud.internetService+xml"
- */
- public static final String INTERNETSERVICE_XML = "application/vnd.tmrk.vCloud.internetService+xml";
-
- /**
- * "application/vnd.tmrk.vCloud.internetService+xml"
- */
- public static final MediaType INTERNETSERVICE_XML_TYPE = new MediaType("application",
- "vnd.tmrk.vCloud.internetService+xml");
-
- /**
- * "application/vnd.tmrk.vCloud.internetServicesList+xml"
- */
- public static final String INTERNETSERVICESLIST_XML = "application/vnd.tmrk.vCloud.internetServicesList+xml";
-
- /**
- * "application/vnd.tmrk.vCloud.internetServicesList+xml"
- */
- public static final MediaType INTERNETSERVICESLIST_XML_TYPE = new MediaType("application",
- "vnd.tmrk.vCloud.internetServicesList+xml");
-
- /**
- * "application/vnd.tmrk.vCloud.nodeService+xml"
- */
- public static final String NODESERVICE_XML = "application/vnd.tmrk.vCloud.nodeService+xml";
-
- /**
- * "application/vnd.tmrk.vCloud.nodeService+xml"
- */
- public static final MediaType NODESERVICE_XML_TYPE = new MediaType("application", "vnd.tmrk.vCloud.nodeService+xml");
-
- /**
- * "application/vnd.tmrk.vCloud.catalogItemCustomizationParameters+xml"
- */
- public static final String CATALOGITEMCUSTOMIZATIONPARAMETERS_XML = "application/vnd.tmrk.vCloud.catalogItemCustomizationParameters+xml";
-
- /**
- * "application/vnd.tmrk.vCloud.catalogItemCustomizationParameters+xml"
- */
- public static final MediaType CATALOGITEMCUSTOMIZATIONPARAMETERS_XML_TYPE = new MediaType("application",
- "vnd.tmrk.vCloud.catalogItemCustomizationParameters+xml");
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/VCloudResponseException.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/VCloudResponseException.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/VCloudResponseException.java
deleted file mode 100644
index 7f7e83a..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/VCloudResponseException.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloud_0_8;
-
-import org.jclouds.http.HttpCommand;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.HttpResponseException;
-import org.jclouds.trmk.vcloud_0_8.domain.VCloudError;
-
-/**
- * Encapsulates an VCloud Error.
- *
- * @author Adrian Cole
- *
- */
-public class VCloudResponseException extends HttpResponseException {
-
- private org.jclouds.trmk.vcloud_0_8.domain.VCloudError error;
-
- public VCloudResponseException(HttpCommand command, HttpResponse response, VCloudError error) {
- super(String.format("request %s failed with code %s, error: %s", command.getCurrentRequest().getRequestLine(), response
- .getStatusCode(), error.toString()), command, response);
- this.setError(error);
-
- }
-
- public VCloudResponseException(HttpCommand command, HttpResponse response, VCloudError error, Throwable cause) {
- super(String.format("request %1$s failed with error: %2$s", command.getCurrentRequest().getRequestLine(), error
- .toString()), command, response, cause);
- this.setError(error);
-
- }
-
- public VCloudResponseException(String message, HttpCommand command, HttpResponse response, VCloudError error) {
- super(message, command, response);
- this.setError(error);
-
- }
-
- public VCloudResponseException(String message, HttpCommand command, HttpResponse response, VCloudError error,
- Throwable cause) {
- super(message, command, response, cause);
- this.setError(error);
-
- }
-
- public void setError(VCloudError error) {
- this.error = error;
- }
-
- public VCloudError getError() {
- return error;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/VCloudToken.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/VCloudToken.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/VCloudToken.java
deleted file mode 100644
index 7278321..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/VCloudToken.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloud_0_8;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * A VCloud Session Token
- *
- * @author Adrian Cole
- *
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface VCloudToken {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindAddInternetServiceToXmlPayload.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindAddInternetServiceToXmlPayload.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindAddInternetServiceToXmlPayload.java
deleted file mode 100644
index 30fc2ce..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindAddInternetServiceToXmlPayload.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloud_0_8.binders;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.trmk.vcloud_0_8.reference.TerremarkConstants.PROPERTY_TERREMARK_EXTENSION_NS;
-
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.MapBinder;
-import org.jclouds.rest.binders.BindToStringPayload;
-import org.jclouds.util.Patterns;
-import org.jclouds.util.Strings2;
-
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableMap;
-
-/**
- *
- * @author Adrian Cole
- *
- */
-@Singleton
-public class BindAddInternetServiceToXmlPayload implements MapBinder {
- @Inject
- @Named("CreateInternetService")
- private String xmlTemplate;
- @Inject
- private BindToStringPayload stringBinder;
- @Inject
- @Named(PROPERTY_TERREMARK_EXTENSION_NS)
- private String ns;
-
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Map<String, Object> postParams) {
-
- String name = checkNotNull(postParams.get("name"), "name parameter not present").toString();
- String protocol = checkNotNull(postParams.get("protocol"), "protocol parameter not present").toString();
- String port = checkNotNull(postParams.get("port"), "port parameter not present").toString();
- String enabled = checkNotNull(postParams.get("enabled"), "enabled parameter not present").toString();
- String description = (String) postParams.get("description");
- String payload = Strings2.replaceTokens(xmlTemplate,
- ImmutableMap.of("name", name, "protocol", protocol, "port", port, "enabled", enabled, "ns", ns));
- try {
- payload = Patterns.TOKEN_TO_PATTERN.get("description").matcher(payload).replaceAll(description == null ? ""
- : String.format("\n\t<Description>%s</Description>", description));
- payload = Patterns.TOKEN_TO_PATTERN.get("monitor").matcher(payload).replaceAll(getMonitorString(postParams));
- } catch (ExecutionException e) {
- Throwables.propagate(e);
- }
- return stringBinder.bindToRequest(request, payload);
- }
-
- private String getMonitorString(Map<String, Object> postParams)
- {
- // Sending no <Monitor> element to Terremark will result in default behavior, which is to create a monitor.
- String monitor = (String) postParams.get("monitor");
- if (monitor == null || "true".equalsIgnoreCase(monitor)) {
- return "";
- }
- return "\n\t<Monitor><MonitorType>Disabled</MonitorType></Monitor>";
- }
-
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- throw new IllegalStateException("CreateInternetService needs parameters");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindAddNodeServiceToXmlPayload.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindAddNodeServiceToXmlPayload.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindAddNodeServiceToXmlPayload.java
deleted file mode 100644
index 03477d1..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindAddNodeServiceToXmlPayload.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloud_0_8.binders;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.trmk.vcloud_0_8.reference.TerremarkConstants.PROPERTY_TERREMARK_EXTENSION_NS;
-
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.MapBinder;
-import org.jclouds.rest.binders.BindToStringPayload;
-import org.jclouds.util.Patterns;
-import org.jclouds.util.Strings2;
-
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableMap;
-
-/**
- *
- * @author Adrian Cole
- *
- */
-@Singleton
-public class BindAddNodeServiceToXmlPayload implements MapBinder {
-
- @Inject
- @Named("CreateNodeService")
- private String xmlTemplate;
- @Inject
- private BindToStringPayload stringBinder;
- @Inject
- @Named(PROPERTY_TERREMARK_EXTENSION_NS)
- private String ns;
-
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Map<String, Object> postParams) {
- String ipAddress = checkNotNull(postParams.get("ipAddress"), "ipAddress parameter not present").toString();
- String name = checkNotNull(postParams.get("name"), "name parameter not present").toString();
- String port = checkNotNull(postParams.get("port"), "port parameter not present").toString();
- String enabled = checkNotNull(postParams.get("enabled"), "enabled parameter not present").toString();
- String description = (String) postParams.get("description");
-
- String payload = Strings2.replaceTokens(xmlTemplate,
- ImmutableMap.of("name", name, "ipAddress", ipAddress, "port", port, "enabled", enabled, "ns", ns));
- try {
- payload = Patterns.TOKEN_TO_PATTERN.get("description").matcher(payload).replaceAll(description == null ? ""
- : String.format("\n <Description>%s</Description>", description));
- } catch (ExecutionException e) {
- Throwables.propagate(e);
- }
- return stringBinder.bindToRequest(request, payload);
- }
-
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- throw new IllegalStateException("CreateNodeService needs parameters");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindCloneVAppParamsToXmlPayload.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindCloneVAppParamsToXmlPayload.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindCloneVAppParamsToXmlPayload.java
deleted file mode 100644
index 18309a9..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindCloneVAppParamsToXmlPayload.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloud_0_8.binders;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static org.jclouds.trmk.vcloud_0_8.reference.VCloudConstants.PROPERTY_VCLOUD_XML_NAMESPACE;
-import static org.jclouds.trmk.vcloud_0_8.reference.VCloudConstants.PROPERTY_VCLOUD_XML_SCHEMA;
-
-import java.util.Map;
-import java.util.Properties;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.MapBinder;
-import org.jclouds.rest.binders.BindToStringPayload;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType;
-import org.jclouds.trmk.vcloud_0_8.options.CloneVAppOptions;
-
-import com.google.inject.Inject;
-import com.jamesmurty.utils.XMLBuilder;
-
-/**
- *
- * @author Adrian Cole
- *
- */
-@Singleton
-public class BindCloneVAppParamsToXmlPayload implements MapBinder {
-
- protected final String ns;
- protected final String schema;
- private final BindToStringPayload stringBinder;
-
- @Inject
- public BindCloneVAppParamsToXmlPayload(BindToStringPayload stringBinder,
- @Named(PROPERTY_VCLOUD_XML_NAMESPACE) String ns, @Named(PROPERTY_VCLOUD_XML_SCHEMA) String schema) {
- this.ns = ns;
- this.schema = schema;
- this.stringBinder = stringBinder;
- }
-
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Map<String, Object> postParams) {
- checkArgument(checkNotNull(request, "request") instanceof GeneratedHttpRequest,
- "this binder is only valid for GeneratedHttpRequests!");
- GeneratedHttpRequest gRequest = (GeneratedHttpRequest) request;
- String newName = checkNotNull(postParams.remove("newName"), "newName").toString();
- String vApp = checkNotNull(postParams.remove("vApp"), "vApp").toString();
-
- CloneVAppOptions options = findOptionsInArgsOrNull(gRequest);
- if (options == null) {
- options = new CloneVAppOptions();
- }
- try {
- return stringBinder.bindToRequest(request, generateXml(newName, vApp, options));
- } catch (ParserConfigurationException e) {
- throw new RuntimeException(e);
- } catch (FactoryConfigurationError e) {
- throw new RuntimeException(e);
- } catch (TransformerException e) {
- throw new RuntimeException(e);
- }
-
- }
-
- protected XMLBuilder buildRoot(String name, boolean deploy, boolean powerOn) throws ParserConfigurationException,
- FactoryConfigurationError {
- XMLBuilder rootBuilder = XMLBuilder.create("CloneVAppParams").a("name", name).a("deploy", deploy + "")
- .a("powerOn", powerOn + "").a("xmlns", ns).a("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance")
- .a("xsi:schemaLocation", ns + " " + schema);
- return rootBuilder;
- }
-
- protected String generateXml(String newName, String vApp, CloneVAppOptions options)
- throws ParserConfigurationException, FactoryConfigurationError, TransformerException {
- XMLBuilder rootBuilder = buildRoot(newName, options.isDeploy(), options.isPowerOn());
- if (options.getDescription() != null)
- rootBuilder.e("Description").text(options.getDescription());
- rootBuilder.e("VApp").a("xmlns", ns).a("href", vApp).a("type", TerremarkVCloudMediaType.VAPP_XML);
- Properties outputProperties = new Properties();
- outputProperties.put(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
- return rootBuilder.asString(outputProperties);
- }
-
- protected CloneVAppOptions findOptionsInArgsOrNull(GeneratedHttpRequest gRequest) {
- for (Object arg : gRequest.getInvocation().getArgs()) {
- if (arg instanceof CloneVAppOptions) {
- return (CloneVAppOptions) arg;
- } else if (arg instanceof CloneVAppOptions[]) {
- CloneVAppOptions[] options = (CloneVAppOptions[]) arg;
- return (options.length > 0) ? options[0] : null;
- }
- }
- return null;
- }
-
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- throw new IllegalStateException("CloneVAppParams is needs parameters");
- }
-
- protected String ifNullDefaultTo(String value, String defaultValue) {
- return value != null ? value : checkNotNull(defaultValue, "defaultValue");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/ddfefd7e/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindCreateKeyToXmlPayload.java
----------------------------------------------------------------------
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindCreateKeyToXmlPayload.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindCreateKeyToXmlPayload.java
deleted file mode 100644
index 0a2b25c..0000000
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindCreateKeyToXmlPayload.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.trmk.vcloud_0_8.binders;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.trmk.vcloud_0_8.reference.TerremarkConstants.PROPERTY_TERREMARK_EXTENSION_NS;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.MapBinder;
-import org.jclouds.rest.binders.BindToStringPayload;
-import org.jclouds.util.Strings2;
-
-import com.google.common.collect.ImmutableMap;
-
-/**
- *
- * @author Adrian Cole
- *
- */
-@Singleton
-public class BindCreateKeyToXmlPayload implements MapBinder {
-
- private final String xmlTemplate;
- private final BindToStringPayload stringBinder;
- private final String ns;
-
- @Inject
- BindCreateKeyToXmlPayload(@Named(PROPERTY_TERREMARK_EXTENSION_NS) String ns, @Named("CreateKey") String xmlTemplate,
- BindToStringPayload stringBinder) {
- this.ns = ns;
- this.xmlTemplate = xmlTemplate;
- this.stringBinder = stringBinder;
- }
-
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Map<String, Object> postParams) {
- String name = checkNotNull(postParams.get("name"), "name parameter not present").toString();
- String isDefault = checkNotNull(postParams.get("isDefault"), "isDefault parameter not present").toString();
-
- String payload = Strings2.replaceTokens(xmlTemplate,
- ImmutableMap.of("name", name, "isDefault", isDefault, "ns", ns));
- return stringBinder.bindToRequest(request, payload);
- }
-
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- throw new IllegalStateException("CreateKey needs parameters");
- }
-
-}