You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2014/06/08 06:47:23 UTC

[47/48] git commit: JCLOUDS-546: Remove Javadoc @author annotations

JCLOUDS-546: Remove Javadoc @author annotations

Annotations removed with:

find -name \*.java | xargs sed -i /@author/d

Empty Javadoc removed with multiple iterations of:

find -name \*.java | xargs sed -i -z 's/ \*\n \*\// \*\//'
find -name \*.java | xargs sed -i -z 's/ \* \n \*\// \*\//'
find -name \*.java | xargs sed -i -z 's/\/\*\*\n \*\/\n//'


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/9cdd53b0
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/9cdd53b0
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/9cdd53b0

Branch: refs/heads/master
Commit: 9cdd53b0b7a87fa26a77b9ce370882f2a9cc7d71
Parents: 39f77ad
Author: Andrew Gaul <ga...@apache.org>
Authored: Fri Jun 6 19:16:34 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sat Jun 7 21:44:54 2014 -0700

----------------------------------------------------------------------
 .../src/main/java/org/jclouds/atmos/AtmosApiMetadata.java     | 2 --
 .../src/main/java/org/jclouds/atmos/AtmosAsyncClient.java     | 1 -
 apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java   | 1 -
 .../main/java/org/jclouds/atmos/AtmosResponseException.java   | 2 --
 .../java/org/jclouds/atmos/binders/BindMetadataToHeaders.java | 3 ---
 .../org/jclouds/atmos/binders/BindUserMetadataToHeaders.java  | 3 ---
 .../java/org/jclouds/atmos/blobstore/AtmosAsyncBlobStore.java | 1 -
 .../org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java   | 4 ----
 .../main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java | 3 ---
 .../atmos/blobstore/config/AtmosBlobStoreContextModule.java   | 2 --
 .../atmos/blobstore/functions/BlobMetadataToObject.java       | 3 ---
 .../functions/BlobStoreListOptionsToListOptions.java          | 3 ---
 .../atmos/blobstore/functions/BlobToContentMetadata.java      | 3 ---
 .../org/jclouds/atmos/blobstore/functions/BlobToObject.java   | 3 ---
 .../atmos/blobstore/functions/BlobToSystemMetadata.java       | 3 ---
 .../functions/DirectoryEntryListToResourceMetadataList.java   | 3 ---
 .../org/jclouds/atmos/blobstore/functions/ObjectToBlob.java   | 3 ---
 .../atmos/blobstore/functions/ObjectToBlobMetadata.java       | 3 ---
 .../main/java/org/jclouds/atmos/config/AtmosObjectModule.java | 2 --
 .../main/java/org/jclouds/atmos/config/AtmosParserModule.java | 5 -----
 .../java/org/jclouds/atmos/config/AtmosRestClientModule.java  | 2 --
 .../src/main/java/org/jclouds/atmos/domain/AtmosError.java    | 3 ---
 .../src/main/java/org/jclouds/atmos/domain/AtmosObject.java   | 4 ----
 .../src/main/java/org/jclouds/atmos/domain/BoundedSet.java    | 5 -----
 .../main/java/org/jclouds/atmos/domain/DirectoryEntry.java    | 2 --
 .../java/org/jclouds/atmos/domain/MutableContentMetadata.java | 2 --
 .../main/java/org/jclouds/atmos/domain/SystemMetadata.java    | 2 --
 .../src/main/java/org/jclouds/atmos/domain/UserMetadata.java  | 2 --
 .../org/jclouds/atmos/domain/internal/AtmosObjectImpl.java    | 2 --
 .../jclouds/atmos/domain/internal/BoundedLinkedHashSet.java   | 5 -----
 .../domain/internal/DelegatingMutableContentMetadata.java     | 4 ----
 .../org/jclouds/atmos/fallbacks/EndpointIfAlreadyExists.java  | 4 ----
 .../src/main/java/org/jclouds/atmos/filters/ShareUrl.java     | 2 --
 .../src/main/java/org/jclouds/atmos/filters/SignRequest.java  | 2 --
 .../java/org/jclouds/atmos/functions/AtmosObjectName.java     | 4 ----
 .../functions/ParseDirectoryListFromContentAndHeaders.java    | 2 --
 .../ParseNullableURIFromListOrLocationHeaderIf20x.java        | 2 --
 .../atmos/functions/ParseObjectFromHeadersAndHttpContent.java | 1 -
 .../atmos/functions/ParseSystemMetadataFromHeaders.java       | 3 ---
 .../jclouds/atmos/functions/ParseUserMetadataFromHeaders.java | 3 ---
 .../atmos/functions/ReturnTrueIfGroupACLIsOtherRead.java      | 3 ---
 .../jclouds/atmos/handlers/AtmosClientErrorRetryHandler.java  | 1 -
 .../jclouds/atmos/handlers/AtmosServerErrorRetryHandler.java  | 1 -
 .../jclouds/atmos/handlers/ParseAtmosErrorFromXmlContent.java | 2 --
 .../src/main/java/org/jclouds/atmos/options/ListOptions.java  | 2 --
 .../src/main/java/org/jclouds/atmos/options/PutOptions.java   | 3 ---
 .../main/java/org/jclouds/atmos/reference/AtmosHeaders.java   | 2 --
 .../src/main/java/org/jclouds/atmos/util/AtmosUtils.java      | 2 --
 .../src/main/java/org/jclouds/atmos/xml/ErrorHandler.java     | 2 --
 .../org/jclouds/atmos/xml/ListDirectoryResponseHandler.java   | 1 -
 .../src/test/java/org/jclouds/atmos/AtmosApiMetadataTest.java | 4 ----
 .../src/test/java/org/jclouds/atmos/AtmosAsyncClientTest.java | 2 --
 .../src/test/java/org/jclouds/atmos/AtmosClientLiveTest.java  | 2 --
 .../org/jclouds/atmos/binders/BindMetadataToHeadersTest.java  | 2 --
 .../jclouds/atmos/binders/BindUserMetadataToHeadersTest.java  | 2 --
 .../jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java   | 2 --
 .../functions/ListOptionsToBlobStoreListOptions.java          | 3 ---
 .../functions/ResourceMetadataListToDirectoryEntryList.java   | 3 ---
 .../atmos/blobstore/integration/AtmosBlobSignerLiveTest.java  | 4 ----
 .../integration/AtmosContainerIntegrationLiveTest.java        | 3 ---
 .../atmos/blobstore/integration/AtmosContainerLiveTest.java   | 3 ---
 .../atmos/blobstore/integration/AtmosIntegrationLiveTest.java | 4 ----
 .../jclouds/atmos/blobstore/integration/AtmosLiveTest.java    | 4 ----
 .../integration/AtmosServiceIntegrationLiveTest.java          | 3 ---
 .../jclouds/atmos/fallbacks/EndpointIfAlreadyExistsTest.java  | 4 ----
 .../test/java/org/jclouds/atmos/filters/SignRequestTest.java  | 4 ----
 .../java/org/jclouds/atmos/functions/AtmosObjectNameTest.java | 4 ----
 .../ParseDirectoryListFromContentAndHeadersTest.java          | 2 --
 .../functions/ParseObjectFromHeadersAndHttpContentTest.java   | 2 --
 .../atmos/functions/ParseSystemMetadataFromHeadersTest.java   | 2 --
 .../atmos/functions/ParseUserMetadataFromHeadersTest.java     | 2 --
 .../atmos/handlers/AtmosServerErrorRetryHandlerTest.java      | 2 --
 .../java/org/jclouds/atmos/internal/StubAtmosAsyncClient.java | 2 --
 .../test/java/org/jclouds/atmos/options/ListOptionsTest.java  | 2 --
 .../src/test/java/org/jclouds/atmos/xml/ErrorHandlerTest.java | 2 --
 .../jclouds/atmos/xml/ListDirectoryResponseHandlerTest.java   | 2 --
 apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java | 2 --
 apis/byon/src/main/java/org/jclouds/byon/Node.java            | 4 ----
 .../jclouds/byon/config/BYONComputeServiceContextModule.java  | 4 ----
 .../java/org/jclouds/byon/config/CacheNodeStoreModule.java    | 4 ----
 .../java/org/jclouds/byon/config/ConfiguresNodeStore.java     | 3 ---
 .../java/org/jclouds/byon/config/YamlNodeStoreModule.java     | 4 ----
 apis/byon/src/main/java/org/jclouds/byon/domain/YamlNode.java | 3 ---
 .../java/org/jclouds/byon/functions/NodeToNodeMetadata.java   | 3 ---
 .../java/org/jclouds/byon/functions/NodesFromYamlStream.java  | 3 ---
 .../org/jclouds/byon/internal/BYONComputeServiceAdapter.java  | 4 ----
 .../org/jclouds/byon/suppliers/NodesParsedFromSupplier.java   | 4 ----
 .../byon/suppliers/SupplyFromProviderURIOrNodesProperty.java  | 3 ---
 .../src/test/java/org/jclouds/byon/BYONApiMetadataTest.java   | 4 ----
 .../java/org/jclouds/byon/BYONComputeServiceLiveTest.java     | 4 ----
 .../test/java/org/jclouds/byon/BYONComputeServiceTest.java    | 4 ----
 .../org/jclouds/byon/config/CacheNodeStoreModuleTest.java     | 4 ----
 .../java/org/jclouds/byon/config/YamlNodeStoreModuleTest.java | 4 ----
 .../org/jclouds/byon/functions/NodeToNodeMetadataTest.java    | 4 ----
 .../java/org/jclouds/byon/functions/NodesFromYamlTest.java    | 4 ----
 .../jclouds/byon/suppliers/NodesParsedFromSupplierTest.java   | 4 ----
 .../suppliers/SupplyFromProviderURIOrNodesPropertyTest.java   | 4 ----
 .../src/main/java/org/jclouds/cloudfiles/CDNManagement.java   | 2 --
 .../java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java    | 2 --
 .../java/org/jclouds/cloudfiles/CloudFilesAsyncClient.java    | 1 -
 .../main/java/org/jclouds/cloudfiles/CloudFilesClient.java    | 1 -
 .../binders/BindIterableToHeadersWithPurgeCDNObjectEmail.java | 3 ---
 .../cloudfiles/blobstore/CloudFilesAsyncBlobStore.java        | 1 -
 .../org/jclouds/cloudfiles/blobstore/CloudFilesBlobStore.java | 4 ----
 .../blobstore/config/CloudFilesBlobStoreContextModule.java    | 3 ---
 .../blobstore/functions/CloudFilesObjectToBlobMetadata.java   | 3 ---
 .../cloudfiles/blobstore/functions/EnableCDNAndCache.java     | 4 ----
 .../blobstore/functions/PublicUriForObjectInfo.java           | 3 ---
 .../jclouds/cloudfiles/config/CloudFilesRestClientModule.java | 4 ----
 .../org/jclouds/cloudfiles/domain/ContainerCDNMetadata.java   | 5 -----
 .../jclouds/cloudfiles/functions/ParseCdnUriFromHeaders.java  | 2 --
 .../functions/ParseContainerCDNMetadataFromHeaders.java       | 3 ---
 .../src/main/java/org/jclouds/cloudfiles/package-info.java    | 1 -
 .../org/jclouds/cloudfiles/reference/CloudFilesHeaders.java   | 2 --
 .../java/org/jclouds/cloudfiles/reference/package-info.java   | 1 -
 .../org/jclouds/cloudfiles/CloudFilesApiMetadataTest.java     | 4 ----
 .../org/jclouds/cloudfiles/CloudFilesClientExpectTest.java    | 5 -----
 .../java/org/jclouds/cloudfiles/CloudFilesClientLiveTest.java | 2 --
 .../BindIterableToHeadersWithPurgeCDNObjectEmailTest.java     | 2 --
 .../cloudfiles/blobstore/CloudFilesBlobSignerExpectTest.java  | 2 --
 .../integration/CloudFilesBlobIntegrationLiveTest.java        | 4 ----
 .../blobstore/integration/CloudFilesBlobLiveTest.java         | 3 ---
 .../blobstore/integration/CloudFilesBlobSignerLiveTest.java   | 3 ---
 .../integration/CloudFilesContainerIntegrationLiveTest.java   | 3 ---
 .../blobstore/integration/CloudFilesContainerLiveTest.java    | 3 ---
 .../integration/CloudFilesServiceIntegrationLiveTest.java     | 3 ---
 .../ParseContainerCDNMetadataListFromJsonResponseTest.java    | 2 --
 .../internal/BaseCloudFilesRestClientExpectTest.java          | 2 --
 .../org/jclouds/cloudservers/CloudServersApiMetadata.java     | 2 --
 .../org/jclouds/cloudservers/CloudServersAsyncClient.java     | 1 -
 .../java/org/jclouds/cloudservers/CloudServersClient.java     | 1 -
 .../cloudservers/binders/BindBackupScheduleToJsonPayload.java | 5 -----
 .../config/CloudServersComputeServiceContextModule.java       | 2 --
 .../compute/extensions/CloudServersImageExtension.java        | 1 -
 .../compute/functions/CloudServersImageToImage.java           | 4 ----
 .../compute/functions/CloudServersImageToOperatingSystem.java | 4 ----
 .../cloudservers/compute/functions/FlavorToHardware.java      | 3 ---
 .../cloudservers/compute/functions/ServerToNodeMetadata.java  | 3 ---
 .../compute/strategy/CloudServersComputeServiceAdapter.java   | 1 -
 .../cloudservers/config/CloudServersRestClientModule.java     | 4 ----
 .../java/org/jclouds/cloudservers/domain/AbsoluteLimit.java   | 1 -
 .../src/main/java/org/jclouds/cloudservers/domain/Action.java | 4 ----
 .../main/java/org/jclouds/cloudservers/domain/Addresses.java  | 1 -
 .../java/org/jclouds/cloudservers/domain/BackupSchedule.java  | 1 -
 .../src/main/java/org/jclouds/cloudservers/domain/Flavor.java | 1 -
 .../src/main/java/org/jclouds/cloudservers/domain/Image.java  | 1 -
 .../java/org/jclouds/cloudservers/domain/ImageStatus.java     | 2 --
 .../main/java/org/jclouds/cloudservers/domain/RateLimit.java  | 1 -
 .../main/java/org/jclouds/cloudservers/domain/RebootType.java | 4 ----
 .../src/main/java/org/jclouds/cloudservers/domain/Server.java | 1 -
 .../java/org/jclouds/cloudservers/domain/ServerStatus.java    | 2 --
 .../java/org/jclouds/cloudservers/domain/SharedIpGroup.java   | 1 -
 .../handlers/ParseCloudServersErrorFromHttpResponse.java      | 3 ---
 .../org/jclouds/cloudservers/options/CreateServerOptions.java | 5 -----
 .../cloudservers/options/CreateSharedIpGroupOptions.java      | 6 ------
 .../java/org/jclouds/cloudservers/options/ListOptions.java    | 1 -
 .../jclouds/cloudservers/options/RebuildServerOptions.java    | 6 ------
 .../org/jclouds/cloudservers/predicates/ServerActive.java     | 2 --
 .../org/jclouds/cloudservers/predicates/ServerDeleted.java    | 2 --
 .../org/jclouds/cloudservers/CloudServersApiMetadataTest.java | 4 ----
 .../org/jclouds/cloudservers/CloudServersAsyncClientTest.java | 2 --
 .../org/jclouds/cloudservers/CloudServersClientLiveTest.java  | 2 --
 .../java/org/jclouds/cloudservers/CloudServersExpectTest.java | 4 ----
 .../compute/CloudServersComputeServiceLiveTest.java           | 2 --
 .../config/CloudServersComputeServiceContextModuleTest.java   | 3 ---
 .../extensions/CloudServersImageExtensionExpectTest.java      | 5 -----
 .../extensions/CloudServersImageExtensionLiveTest.java        | 3 ---
 .../compute/functions/CloudServersImageToImageTest.java       | 3 ---
 .../cloudservers/compute/functions/FlavorToHardwareTest.java  | 3 ---
 .../compute/functions/ServerToNodeMetadataTest.java           | 3 ---
 .../test/java/org/jclouds/cloudservers/domain/ServerTest.java | 2 --
 .../functions/ParseAddressesFromJsonResponseTest.java         | 2 --
 .../functions/ParseBackupScheduleFromJsonResponseTest.java    | 2 --
 .../functions/ParseFlavorFromJsonResponseTest.java            | 2 --
 .../functions/ParseFlavorListFromJsonResponseTest.java        | 2 --
 .../functions/ParseImageFromJsonResponseTest.java             | 2 --
 .../functions/ParseImageListFromJsonResponseTest.java         | 2 --
 .../functions/ParseInetAddressListFromJsonResponseTest.java   | 2 --
 .../functions/ParseServerFromJsonResponseTest.java            | 2 --
 .../functions/ParseServerListFromJsonResponseTest.java        | 2 --
 .../functions/ParseSharedIpGroupFromJsonResponseTest.java     | 2 --
 .../functions/ParseSharedIpGroupListFromJsonResponseTest.java | 2 --
 .../jclouds/cloudservers/handlers/RetryOnRenewExpectTest.java | 2 --
 .../internal/BaseCloudServersComputeServiceExpectTest.java    | 5 -----
 .../internal/BaseCloudServersRestClientExpectTest.java        | 2 --
 .../jclouds/cloudservers/options/CreateServerOptionsTest.java | 2 --
 .../cloudservers/options/CreateSharedIpGroupOptionsTest.java  | 2 --
 .../org/jclouds/cloudservers/options/ListOptionsTest.java     | 2 --
 .../cloudservers/options/RebuildServerOptionsTest.java        | 2 --
 .../src/main/java/org/jclouds/cloudsigma/CloudSigmaApi.java   | 1 -
 .../java/org/jclouds/cloudsigma/CloudSigmaApiMetadata.java    | 2 --
 .../binders/BindCloneDriveOptionsToPlainTextString.java       | 4 ----
 .../cloudsigma/binders/BindDriveDataToPlainTextString.java    | 4 ----
 .../cloudsigma/binders/BindDriveToPlainTextString.java        | 4 ----
 .../cloudsigma/binders/BindServerToPlainTextString.java       | 4 ----
 .../cloudsigma/compute/CloudSigmaComputeServiceAdapter.java   | 1 -
 .../cloudsigma/compute/CloudSigmaTemplateBuilderImpl.java     | 3 ---
 .../compute/config/CloudSigmaComputeServiceContextModule.java | 4 ----
 .../functions/ParseOsFamilyVersion64BitFromImageName.java     | 3 ---
 .../cloudsigma/compute/functions/PreinstalledDiskToImage.java | 3 ---
 .../compute/functions/ServerInfoToNodeMetadata.java           | 4 ----
 .../jclouds/cloudsigma/config/CloudSigmaRestClientModule.java | 2 --
 .../main/java/org/jclouds/cloudsigma/domain/AffinityType.java | 2 --
 .../main/java/org/jclouds/cloudsigma/domain/BlockDevice.java  | 4 ----
 .../main/java/org/jclouds/cloudsigma/domain/ClaimType.java    | 2 --
 .../org/jclouds/cloudsigma/domain/CreateDriveRequest.java     | 4 ----
 .../src/main/java/org/jclouds/cloudsigma/domain/Device.java   | 4 ----
 .../src/main/java/org/jclouds/cloudsigma/domain/Drive.java    | 4 ----
 .../main/java/org/jclouds/cloudsigma/domain/DriveData.java    | 4 ----
 .../main/java/org/jclouds/cloudsigma/domain/DriveInfo.java    | 4 ----
 .../main/java/org/jclouds/cloudsigma/domain/DriveMetrics.java | 4 ----
 .../main/java/org/jclouds/cloudsigma/domain/DriveStatus.java  | 4 ----
 .../main/java/org/jclouds/cloudsigma/domain/DriveType.java    | 4 ----
 .../main/java/org/jclouds/cloudsigma/domain/IDEDevice.java    | 4 ----
 .../src/main/java/org/jclouds/cloudsigma/domain/Item.java     | 4 ----
 .../main/java/org/jclouds/cloudsigma/domain/MediaType.java    | 2 --
 .../src/main/java/org/jclouds/cloudsigma/domain/Model.java    | 4 ----
 .../src/main/java/org/jclouds/cloudsigma/domain/NIC.java      | 4 ----
 .../main/java/org/jclouds/cloudsigma/domain/ProfileInfo.java  | 4 ----
 .../main/java/org/jclouds/cloudsigma/domain/ProfileType.java  | 4 ----
 .../main/java/org/jclouds/cloudsigma/domain/SCSIDevice.java   | 4 ----
 .../src/main/java/org/jclouds/cloudsigma/domain/Server.java   | 4 ----
 .../main/java/org/jclouds/cloudsigma/domain/ServerInfo.java   | 4 ----
 .../java/org/jclouds/cloudsigma/domain/ServerMetrics.java     | 4 ----
 .../main/java/org/jclouds/cloudsigma/domain/ServerStatus.java | 4 ----
 .../main/java/org/jclouds/cloudsigma/domain/StaticIPInfo.java | 4 ----
 .../src/main/java/org/jclouds/cloudsigma/domain/VLANInfo.java | 4 ----
 .../src/main/java/org/jclouds/cloudsigma/domain/VNC.java      | 4 ----
 .../java/org/jclouds/cloudsigma/functions/BaseDriveToMap.java | 4 ----
 .../java/org/jclouds/cloudsigma/functions/DriveDataToMap.java | 4 ----
 .../functions/KeyValuesDelimitedByBlankLinesToDriveInfo.java  | 4 ----
 .../KeyValuesDelimitedByBlankLinesToProfileInfo.java          | 4 ----
 .../functions/KeyValuesDelimitedByBlankLinesToServerInfo.java | 4 ----
 .../KeyValuesDelimitedByBlankLinesToStaticIPInfo.java         | 4 ----
 .../functions/KeyValuesDelimitedByBlankLinesToVLANInfo.java   | 4 ----
 .../ListOfKeyValuesDelimitedByBlankLinesToDriveInfoSet.java   | 4 ----
 .../ListOfKeyValuesDelimitedByBlankLinesToListOfMaps.java     | 4 ----
 .../ListOfKeyValuesDelimitedByBlankLinesToProfileInfoSet.java | 4 ----
 .../ListOfKeyValuesDelimitedByBlankLinesToServerInfoSet.java  | 4 ----
 ...ListOfKeyValuesDelimitedByBlankLinesToStaticIPInfoSet.java | 4 ----
 .../ListOfKeyValuesDelimitedByBlankLinesToVLANInfoSet.java    | 4 ----
 .../ListOfMapsToListOfKeyValuesDelimitedByBlankLines.java     | 4 ----
 .../java/org/jclouds/cloudsigma/functions/MapToDevices.java   | 4 ----
 .../java/org/jclouds/cloudsigma/functions/MapToDriveInfo.java | 4 ----
 .../org/jclouds/cloudsigma/functions/MapToDriveMetrics.java   | 4 ----
 .../main/java/org/jclouds/cloudsigma/functions/MapToNICs.java | 4 ----
 .../org/jclouds/cloudsigma/functions/MapToProfileInfo.java    | 4 ----
 .../org/jclouds/cloudsigma/functions/MapToServerInfo.java     | 4 ----
 .../org/jclouds/cloudsigma/functions/MapToServerMetrics.java  | 4 ----
 .../org/jclouds/cloudsigma/functions/MapToStaticIPInfo.java   | 4 ----
 .../java/org/jclouds/cloudsigma/functions/MapToVLANInfo.java  | 4 ----
 .../java/org/jclouds/cloudsigma/functions/ReturnPayload.java  | 3 ---
 .../java/org/jclouds/cloudsigma/functions/ServerToMap.java    | 4 ----
 .../java/org/jclouds/cloudsigma/functions/SplitNewlines.java  | 4 ----
 .../functions/SplitNewlinesAndReturnSecondField.java          | 4 ----
 .../jclouds/cloudsigma/handlers/CloudSigmaErrorHandler.java   | 3 ---
 .../org/jclouds/cloudsigma/options/CloneDriveOptions.java     | 3 ---
 .../java/org/jclouds/cloudsigma/predicates/DriveClaimed.java  | 4 ----
 .../org/jclouds/cloudsigma/reference/CloudSigmaConstants.java | 4 ----
 .../src/main/java/org/jclouds/cloudsigma/util/Servers.java    | 4 ----
 .../org/jclouds/cloudsigma/CloudSigmaApiMetadataTest.java     | 4 ----
 .../test/java/org/jclouds/cloudsigma/CloudSigmaApiTest.java   | 2 --
 .../java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java | 2 --
 .../binders/BindCloneDriveOptionsToPlainTextStringTest.java   | 4 ----
 .../binders/BindDriveDataToPlainTextStringTest.java           | 4 ----
 .../cloudsigma/binders/BindDriveToPlainTextStringTest.java    | 4 ----
 .../cloudsigma/binders/BindServerToPlainTextStringTest.java   | 4 ----
 .../cloudsigma/compute/CloudSigmaComputeServiceLiveTest.java  | 3 ---
 .../org/jclouds/cloudsigma/functions/BaseDriveToMapTest.java  | 4 ----
 .../org/jclouds/cloudsigma/functions/DriveDataToMapTest.java  | 4 ----
 .../KeyValuesDelimitedByBlankLinesToDriveInfoTest.java        | 4 ----
 .../KeyValuesDelimitedByBlankLinesToProfileInfoTest.java      | 4 ----
 .../KeyValuesDelimitedByBlankLinesToServerInfoTest.java       | 4 ----
 .../KeyValuesDelimitedByBlankLinesToVLANInfoTest.java         | 4 ----
 ...istOfKeyValuesDelimitedByBlankLinesToDriveInfoSetTest.java | 4 ----
 .../ListOfKeyValuesDelimitedByBlankLinesToListOfMapsTest.java | 4 ----
 ...stOfKeyValuesDelimitedByBlankLinesToServerInfoSetTest.java | 4 ----
 ...ListOfKeyValuesDelimitedByBlankLinesToVLANInfoSetTest.java | 4 ----
 .../ListOfMapsToListOfKeyValuesDelimitedByBlankLinesTest.java | 4 ----
 .../org/jclouds/cloudsigma/functions/MapToDriveInfoTest.java  | 4 ----
 .../jclouds/cloudsigma/functions/MapToProfileInfoTest.java    | 4 ----
 .../org/jclouds/cloudsigma/functions/MapToServerInfoTest.java | 4 ----
 .../org/jclouds/cloudsigma/functions/MapToVLANInfoTest.java   | 4 ----
 .../functions/ParseOsFamilyVersion64BitFromImageNameTest.java | 4 ----
 .../org/jclouds/cloudsigma/functions/ServerToMapTest.java     | 4 ----
 .../org/jclouds/cloudsigma/functions/SplitNewlinesTest.java   | 2 --
 .../cloudsigma/handlers/CloudSigmaErrorHandlerTest.java       | 4 ----
 .../org/jclouds/cloudsigma/options/CloneDriveOptionsTest.java | 2 --
 .../main/java/org/jclouds/cloudstack/AsyncJobException.java   | 3 ---
 .../src/main/java/org/jclouds/cloudstack/CloudStackApi.java   | 1 -
 .../java/org/jclouds/cloudstack/CloudStackApiMetadata.java    | 2 --
 .../main/java/org/jclouds/cloudstack/CloudStackContext.java   | 6 ------
 .../main/java/org/jclouds/cloudstack/CloudStackDomainApi.java | 1 -
 .../main/java/org/jclouds/cloudstack/CloudStackGlobalApi.java | 1 -
 .../BindAccountSecurityGroupPairsToIndexedQueryParams.java    | 4 ----
 .../binders/BindCIDRsToCommaDelimitedQueryParam.java          | 4 ----
 .../binders/BindIdListToCommaDelimitedQueryParam.java         | 3 ---
 .../binders/BindSnapshotPolicyScheduleToQueryParam.java       | 4 ----
 .../cloudstack/binders/BindTemplateMetadataToQueryParams.java | 3 ---
 .../cloudstack/binders/ResourceLimitToQueryParams.java        | 1 -
 .../jclouds/cloudstack/compute/CloudStackComputeService.java  | 3 ---
 .../compute/config/CloudStackComputeServiceContextModule.java | 4 ----
 .../compute/extensions/CloudStackImageExtension.java          | 3 ---
 .../compute/extensions/CloudStackSecurityGroupExtension.java  | 2 --
 .../functions/CloudStackSecurityGroupToSecurityGroup.java     | 2 --
 .../compute/functions/IngressRuleToIpPermission.java          | 2 --
 .../cloudstack/compute/functions/OrphanedGroupsByZoneId.java  | 4 ----
 .../compute/functions/ServiceOfferingToHardware.java          | 2 --
 .../jclouds/cloudstack/compute/functions/TemplateToImage.java | 2 --
 .../compute/functions/TemplateToOperatingSystem.java          | 4 ----
 .../compute/functions/VirtualMachineToNodeMetadata.java       | 3 ---
 .../cloudstack/compute/loaders/CreateUniqueKeyPair.java       | 4 ----
 .../cloudstack/compute/loaders/FindSecurityGroupOrCreate.java | 5 -----
 .../cloudstack/compute/options/CloudStackTemplateOptions.java | 2 --
 .../compute/predicates/AllNodesInGroupTerminated.java         | 3 ---
 .../compute/strategy/AdvancedNetworkOptionsConverter.java     | 2 --
 .../compute/strategy/BasicNetworkOptionsConverter.java        | 2 --
 .../jclouds/cloudstack/compute/strategy/OptionsConverter.java | 2 --
 .../jclouds/cloudstack/config/CloudStackHttpApiModule.java    | 2 --
 .../org/jclouds/cloudstack/config/CloudStackParserModule.java | 5 -----
 .../org/jclouds/cloudstack/config/CloudStackProperties.java   | 2 --
 .../java/org/jclouds/cloudstack/config/CredentialType.java    | 2 --
 .../src/main/java/org/jclouds/cloudstack/domain/Account.java  | 2 --
 .../src/main/java/org/jclouds/cloudstack/domain/Alert.java    | 2 --
 .../main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java   | 2 --
 .../org/jclouds/cloudstack/domain/AsyncCreateResponse.java    | 2 --
 .../src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java | 2 --
 .../java/org/jclouds/cloudstack/domain/AsyncJobError.java     | 3 ---
 .../main/java/org/jclouds/cloudstack/domain/Capabilities.java | 2 --
 .../src/main/java/org/jclouds/cloudstack/domain/Capacity.java | 2 --
 .../src/main/java/org/jclouds/cloudstack/domain/Cluster.java  | 2 --
 .../org/jclouds/cloudstack/domain/ConfigurationEntry.java     | 2 --
 .../main/java/org/jclouds/cloudstack/domain/DiskOffering.java | 2 --
 .../src/main/java/org/jclouds/cloudstack/domain/Domain.java   | 2 --
 .../cloudstack/domain/EncryptedPasswordAndPrivateKey.java     | 4 ----
 .../src/main/java/org/jclouds/cloudstack/domain/Event.java    | 2 --
 .../main/java/org/jclouds/cloudstack/domain/ExtractMode.java  | 3 ---
 .../main/java/org/jclouds/cloudstack/domain/FirewallRule.java | 2 --
 .../main/java/org/jclouds/cloudstack/domain/GuestIPType.java  | 1 -
 .../src/main/java/org/jclouds/cloudstack/domain/Host.java     | 2 --
 .../java/org/jclouds/cloudstack/domain/IPForwardingRule.java  | 2 --
 .../src/main/java/org/jclouds/cloudstack/domain/ISO.java      | 2 --
 .../java/org/jclouds/cloudstack/domain/ISOExtraction.java     | 2 --
 .../java/org/jclouds/cloudstack/domain/ISOPermissions.java    | 2 --
 .../main/java/org/jclouds/cloudstack/domain/IngressRule.java  | 3 ---
 .../main/java/org/jclouds/cloudstack/domain/JobResult.java    | 2 --
 .../java/org/jclouds/cloudstack/domain/LoadBalancerRule.java  | 2 --
 .../java/org/jclouds/cloudstack/domain/LoginResponse.java     | 2 --
 .../src/main/java/org/jclouds/cloudstack/domain/NIC.java      | 2 --
 .../src/main/java/org/jclouds/cloudstack/domain/Network.java  | 2 --
 .../java/org/jclouds/cloudstack/domain/NetworkOffering.java   | 2 --
 .../cloudstack/domain/NetworkOfferingAvailabilityType.java    | 3 ---
 .../java/org/jclouds/cloudstack/domain/NetworkService.java    | 2 --
 .../main/java/org/jclouds/cloudstack/domain/NetworkType.java  | 1 -
 .../src/main/java/org/jclouds/cloudstack/domain/OSType.java   | 2 --
 .../org/jclouds/cloudstack/domain/PermissionOperation.java    | 3 ---
 .../src/main/java/org/jclouds/cloudstack/domain/Pod.java      | 2 --
 .../org/jclouds/cloudstack/domain/PortForwardingRule.java     | 2 --
 .../src/main/java/org/jclouds/cloudstack/domain/Project.java  | 2 --
 .../java/org/jclouds/cloudstack/domain/PublicIPAddress.java   | 2 --
 .../java/org/jclouds/cloudstack/domain/ResourceLimit.java     | 2 --
 .../java/org/jclouds/cloudstack/domain/SecurityGroup.java     | 2 --
 .../java/org/jclouds/cloudstack/domain/ServiceOffering.java   | 2 --
 .../src/main/java/org/jclouds/cloudstack/domain/Snapshot.java | 2 --
 .../java/org/jclouds/cloudstack/domain/SnapshotPolicy.java    | 2 --
 .../org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java | 1 -
 .../main/java/org/jclouds/cloudstack/domain/SshKeyPair.java   | 2 --
 .../main/java/org/jclouds/cloudstack/domain/StoragePool.java  | 2 --
 .../main/java/org/jclouds/cloudstack/domain/StorageType.java  | 1 -
 .../main/java/org/jclouds/cloudstack/domain/SystemVmType.java | 3 ---
 .../src/main/java/org/jclouds/cloudstack/domain/Template.java | 3 ---
 .../org/jclouds/cloudstack/domain/TemplateExtraction.java     | 3 ---
 .../java/org/jclouds/cloudstack/domain/TemplateFilter.java    | 1 -
 .../java/org/jclouds/cloudstack/domain/TemplateMetadata.java  | 2 --
 .../org/jclouds/cloudstack/domain/TemplatePermission.java     | 3 ---
 .../main/java/org/jclouds/cloudstack/domain/TrafficType.java  | 1 -
 .../main/java/org/jclouds/cloudstack/domain/UsageRecord.java  | 2 --
 .../src/main/java/org/jclouds/cloudstack/domain/User.java     | 2 --
 .../src/main/java/org/jclouds/cloudstack/domain/VMGroup.java  | 2 --
 .../java/org/jclouds/cloudstack/domain/VirtualMachine.java    | 2 --
 .../main/java/org/jclouds/cloudstack/domain/VlanIPRange.java  | 2 --
 .../src/main/java/org/jclouds/cloudstack/domain/Volume.java   | 3 ---
 .../src/main/java/org/jclouds/cloudstack/domain/Zone.java     | 3 ---
 .../main/java/org/jclouds/cloudstack/domain/ZoneAndName.java  | 2 --
 .../cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java    | 3 ---
 .../main/java/org/jclouds/cloudstack/features/AccountApi.java | 1 -
 .../main/java/org/jclouds/cloudstack/features/AddressApi.java | 1 -
 .../java/org/jclouds/cloudstack/features/AsyncJobApi.java     | 1 -
 .../org/jclouds/cloudstack/features/ConfigurationApi.java     | 1 -
 .../org/jclouds/cloudstack/features/DomainAccountApi.java     | 1 -
 .../java/org/jclouds/cloudstack/features/DomainDomainApi.java | 1 -
 .../java/org/jclouds/cloudstack/features/DomainLimitApi.java  | 1 -
 .../java/org/jclouds/cloudstack/features/DomainUserApi.java   | 1 -
 .../main/java/org/jclouds/cloudstack/features/EventApi.java   | 1 -
 .../java/org/jclouds/cloudstack/features/FirewallApi.java     | 1 -
 .../org/jclouds/cloudstack/features/GlobalAccountApi.java     | 1 -
 .../java/org/jclouds/cloudstack/features/GlobalAlertApi.java  | 1 -
 .../org/jclouds/cloudstack/features/GlobalCapacityApi.java    | 1 -
 .../jclouds/cloudstack/features/GlobalConfigurationApi.java   | 1 -
 .../java/org/jclouds/cloudstack/features/GlobalDomainApi.java | 1 -
 .../java/org/jclouds/cloudstack/features/GlobalHostApi.java   | 1 -
 .../org/jclouds/cloudstack/features/GlobalOfferingApi.java    | 1 -
 .../java/org/jclouds/cloudstack/features/GlobalPodApi.java    | 1 -
 .../org/jclouds/cloudstack/features/GlobalStoragePoolApi.java | 1 -
 .../java/org/jclouds/cloudstack/features/GlobalUsageApi.java  | 1 -
 .../java/org/jclouds/cloudstack/features/GlobalUserApi.java   | 1 -
 .../java/org/jclouds/cloudstack/features/GlobalVlanApi.java   | 1 -
 .../java/org/jclouds/cloudstack/features/GlobalZoneApi.java   | 1 -
 .../main/java/org/jclouds/cloudstack/features/GuestOSApi.java | 1 -
 .../java/org/jclouds/cloudstack/features/HypervisorApi.java   | 1 -
 .../src/main/java/org/jclouds/cloudstack/features/ISOApi.java | 1 -
 .../main/java/org/jclouds/cloudstack/features/LimitApi.java   | 1 -
 .../java/org/jclouds/cloudstack/features/LoadBalancerApi.java | 1 -
 .../src/main/java/org/jclouds/cloudstack/features/NATApi.java | 1 -
 .../main/java/org/jclouds/cloudstack/features/NetworkApi.java | 1 -
 .../java/org/jclouds/cloudstack/features/OfferingApi.java     | 1 -
 .../main/java/org/jclouds/cloudstack/features/ProjectApi.java | 1 -
 .../java/org/jclouds/cloudstack/features/SSHKeyPairApi.java   | 1 -
 .../org/jclouds/cloudstack/features/SecurityGroupApi.java     | 1 -
 .../main/java/org/jclouds/cloudstack/features/SessionApi.java | 1 -
 .../java/org/jclouds/cloudstack/features/SnapshotApi.java     | 1 -
 .../java/org/jclouds/cloudstack/features/TemplateApi.java     | 1 -
 .../main/java/org/jclouds/cloudstack/features/VMGroupApi.java | 1 -
 .../org/jclouds/cloudstack/features/VirtualMachineApi.java    | 1 -
 .../main/java/org/jclouds/cloudstack/features/VolumeApi.java  | 1 -
 .../main/java/org/jclouds/cloudstack/features/ZoneApi.java    | 1 -
 .../filters/AddSessionKeyAndJSessionIdToRequest.java          | 1 -
 .../org/jclouds/cloudstack/filters/AuthenticationFilter.java  | 3 ---
 .../main/java/org/jclouds/cloudstack/filters/QuerySigner.java | 2 --
 .../cloudstack/functions/CreateFirewallRulesForIP.java        | 4 ----
 .../cloudstack/functions/CreatePortForwardingRulesForIP.java  | 4 ----
 .../cloudstack/functions/CreateSecurityGroupIfNeeded.java     | 5 -----
 .../java/org/jclouds/cloudstack/functions/DateToYyyyMmDd.java | 2 --
 .../cloudstack/functions/ParseAsyncJobFromHttpResponse.java   | 4 ----
 .../cloudstack/functions/ParseAsyncJobsFromHttpResponse.java  | 3 ---
 .../cloudstack/functions/ParseEventTypesFromHttpResponse.java | 3 ---
 .../functions/ParseIdToNameEntryFromHttpResponse.java         | 4 ----
 .../cloudstack/functions/ParseIdToNameFromHttpResponse.java   | 4 ----
 .../functions/ParseLoginResponseFromHttpResponse.java         | 3 ---
 .../cloudstack/functions/ParseNamesFromHttpResponse.java      | 4 ----
 .../org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java  | 3 ---
 .../functions/ReuseOrAssociateNewPublicIPAddress.java         | 4 ----
 .../functions/StaticNATVirtualMachineInNetwork.java           | 4 ----
 .../functions/WindowsLoginCredentialsFromEncryptedData.java   | 2 --
 .../java/org/jclouds/cloudstack/functions/ZoneIdToZone.java   | 2 --
 .../jclouds/cloudstack/handlers/CloudStackErrorHandler.java   | 5 -----
 .../InvalidateSessionAndRetryOn401AndLogoutOnClose.java       | 2 --
 .../jclouds/cloudstack/internal/CloudStackContextImpl.java    | 3 ---
 .../jclouds/cloudstack/options/AccountInDomainOptions.java    | 1 -
 .../org/jclouds/cloudstack/options/AddClusterOptions.java     | 2 --
 .../java/org/jclouds/cloudstack/options/AddHostOptions.java   | 2 --
 .../cloudstack/options/AddSecondaryStorageOptions.java        | 2 --
 .../cloudstack/options/AssignVirtualMachineOptions.java       | 1 -
 .../jclouds/cloudstack/options/AssociateIPAddressOptions.java | 1 -
 .../org/jclouds/cloudstack/options/CreateAccountOptions.java  | 1 -
 .../jclouds/cloudstack/options/CreateDiskOfferingOptions.java | 1 -
 .../org/jclouds/cloudstack/options/CreateDomainOptions.java   | 1 -
 .../jclouds/cloudstack/options/CreateFirewallRuleOptions.java | 1 -
 .../cloudstack/options/CreateIPForwardingRuleOptions.java     | 1 -
 .../cloudstack/options/CreateLoadBalancerRuleOptions.java     | 1 -
 .../org/jclouds/cloudstack/options/CreateNetworkOptions.java  | 1 -
 .../java/org/jclouds/cloudstack/options/CreatePodOptions.java | 2 --
 .../cloudstack/options/CreateServiceOfferingOptions.java      | 1 -
 .../org/jclouds/cloudstack/options/CreateSnapshotOptions.java | 1 -
 .../org/jclouds/cloudstack/options/CreateTemplateOptions.java | 1 -
 .../org/jclouds/cloudstack/options/CreateUserOptions.java     | 1 -
 .../org/jclouds/cloudstack/options/CreateVMGroupOptions.java  | 1 -
 .../jclouds/cloudstack/options/CreateVlanIPRangeOptions.java  | 2 --
 .../org/jclouds/cloudstack/options/CreateZoneOptions.java     | 1 -
 .../org/jclouds/cloudstack/options/DeleteHostOptions.java     | 2 --
 .../java/org/jclouds/cloudstack/options/DeleteISOOptions.java | 1 -
 .../org/jclouds/cloudstack/options/DeleteTemplateOptions.java | 1 -
 .../cloudstack/options/DeployVirtualMachineOptions.java       | 1 -
 .../org/jclouds/cloudstack/options/ExtractISOOptions.java     | 1 -
 .../jclouds/cloudstack/options/ExtractTemplateOptions.java    | 3 ---
 .../cloudstack/options/GenerateUsageRecordsOptions.java       | 2 --
 .../org/jclouds/cloudstack/options/ListAccountsOptions.java   | 1 -
 .../org/jclouds/cloudstack/options/ListAlertsOptions.java     | 2 --
 .../org/jclouds/cloudstack/options/ListAsyncJobsOptions.java  | 1 -
 .../org/jclouds/cloudstack/options/ListCapacityOptions.java   | 2 --
 .../org/jclouds/cloudstack/options/ListClustersOptions.java   | 1 -
 .../cloudstack/options/ListConfigurationEntriesOptions.java   | 1 -
 .../jclouds/cloudstack/options/ListDiskOfferingsOptions.java  | 1 -
 .../jclouds/cloudstack/options/ListDomainChildrenOptions.java | 1 -
 .../org/jclouds/cloudstack/options/ListDomainsOptions.java    | 1 -
 .../cloudstack/options/ListEgressFirewallRulesOptions.java    | 1 -
 .../org/jclouds/cloudstack/options/ListEventsOptions.java     | 1 -
 .../jclouds/cloudstack/options/ListFirewallRulesOptions.java  | 1 -
 .../java/org/jclouds/cloudstack/options/ListHostsOptions.java | 1 -
 .../cloudstack/options/ListIPForwardingRulesOptions.java      | 1 -
 .../java/org/jclouds/cloudstack/options/ListISOsOptions.java  | 1 -
 .../cloudstack/options/ListLoadBalancerRulesOptions.java      | 1 -
 .../cloudstack/options/ListNetworkOfferingsOptions.java       | 1 -
 .../org/jclouds/cloudstack/options/ListNetworksOptions.java   | 1 -
 .../org/jclouds/cloudstack/options/ListOSTypesOptions.java    | 1 -
 .../java/org/jclouds/cloudstack/options/ListPodsOptions.java  | 2 --
 .../cloudstack/options/ListPortForwardingRulesOptions.java    | 1 -
 .../org/jclouds/cloudstack/options/ListProjectsOptions.java   | 1 -
 .../cloudstack/options/ListPublicIPAddressesOptions.java      | 1 -
 .../jclouds/cloudstack/options/ListResourceLimitsOptions.java | 3 ---
 .../jclouds/cloudstack/options/ListSSHKeyPairsOptions.java    | 3 ---
 .../jclouds/cloudstack/options/ListSecurityGroupsOptions.java | 1 -
 .../cloudstack/options/ListServiceOfferingsOptions.java       | 1 -
 .../cloudstack/options/ListSnapshotPoliciesOptions.java       | 1 -
 .../org/jclouds/cloudstack/options/ListSnapshotsOptions.java  | 1 -
 .../jclouds/cloudstack/options/ListStoragePoolsOptions.java   | 2 --
 .../org/jclouds/cloudstack/options/ListTemplatesOptions.java  | 1 -
 .../jclouds/cloudstack/options/ListUsageRecordsOptions.java   | 2 --
 .../java/org/jclouds/cloudstack/options/ListUsersOptions.java | 1 -
 .../org/jclouds/cloudstack/options/ListVMGroupsOptions.java   | 1 -
 .../cloudstack/options/ListVirtualMachinesOptions.java        | 1 -
 .../jclouds/cloudstack/options/ListVlanIPRangesOptions.java   | 2 --
 .../org/jclouds/cloudstack/options/ListVolumesOptions.java    | 2 --
 .../java/org/jclouds/cloudstack/options/ListZonesOptions.java | 1 -
 .../org/jclouds/cloudstack/options/RegisterISOOptions.java    | 1 -
 .../jclouds/cloudstack/options/RegisterTemplateOptions.java   | 1 -
 .../jclouds/cloudstack/options/StopVirtualMachineOptions.java | 2 --
 .../org/jclouds/cloudstack/options/UpdateAccountOptions.java  | 1 -
 .../org/jclouds/cloudstack/options/UpdateClusterOptions.java  | 2 --
 .../jclouds/cloudstack/options/UpdateDiskOfferingOptions.java | 1 -
 .../org/jclouds/cloudstack/options/UpdateDomainOptions.java   | 1 -
 .../org/jclouds/cloudstack/options/UpdateHostOptions.java     | 2 --
 .../java/org/jclouds/cloudstack/options/UpdateISOOptions.java | 1 -
 .../cloudstack/options/UpdateISOPermissionsOptions.java       | 1 -
 .../cloudstack/options/UpdateLoadBalancerRuleOptions.java     | 1 -
 .../cloudstack/options/UpdateNetworkOfferingOptions.java      | 1 -
 .../java/org/jclouds/cloudstack/options/UpdatePodOptions.java | 2 --
 .../cloudstack/options/UpdateServiceOfferingOptions.java      | 1 -
 .../org/jclouds/cloudstack/options/UpdateTemplateOptions.java | 1 -
 .../cloudstack/options/UpdateTemplatePermissionsOptions.java  | 1 -
 .../org/jclouds/cloudstack/options/UpdateUserOptions.java     | 1 -
 .../org/jclouds/cloudstack/options/UpdateVMGroupOptions.java  | 1 -
 .../org/jclouds/cloudstack/options/UpdateZoneOptions.java     | 1 -
 .../cloudstack/predicates/CorrectHypervisorForZone.java       | 2 --
 .../java/org/jclouds/cloudstack/predicates/JobComplete.java   | 2 --
 .../jclouds/cloudstack/predicates/LoadBalancerRuleActive.java | 2 --
 .../cloudstack/predicates/NetworkOfferingPredicates.java      | 4 ----
 .../org/jclouds/cloudstack/predicates/NetworkPredicates.java  | 4 ----
 .../java/org/jclouds/cloudstack/predicates/OSCategoryIn.java  | 5 -----
 .../cloudstack/predicates/PublicIPAddressPredicates.java      | 4 ----
 .../cloudstack/predicates/SecurityGroupPredicates.java        | 4 ----
 .../jclouds/cloudstack/predicates/SshKeyPairPredicates.java   | 3 ---
 .../org/jclouds/cloudstack/predicates/TemplatePredicates.java | 5 -----
 .../org/jclouds/cloudstack/predicates/UserPredicates.java     | 4 ----
 .../cloudstack/predicates/VirtualMachineDestroyed.java        | 2 --
 .../jclouds/cloudstack/predicates/VirtualMachineExpunged.java | 2 --
 .../jclouds/cloudstack/predicates/VirtualMachineRunning.java  | 2 --
 .../org/jclouds/cloudstack/predicates/ZonePredicates.java     | 4 ----
 .../strategy/BlockUntilJobCompletesAndReturnResult.java       | 3 ---
 .../java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java | 4 ----
 .../jclouds/cloudstack/suppliers/NetworksForCurrentUser.java  | 4 ----
 .../jclouds/cloudstack/suppliers/ProjectsForCurrentUser.java  | 4 ----
 .../jclouds/cloudstack/suppliers/ZoneIdToZoneSupplier.java    | 2 --
 .../main/java/org/jclouds/cloudstack/util/ApiKeyPairs.java    | 3 ---
 .../org/jclouds/cloudstack/util/SnapshotPolicySchedules.java  | 2 --
 .../org/jclouds/cloudstack/CloudStackApiMetadataTest.java     | 4 ----
 .../org/jclouds/cloudstack/CloudStackContextBuilderTest.java  | 3 ---
 .../jclouds/cloudstack/PasswordAuthenticationExpectTest.java  | 1 -
 .../compute/CloudStackComputeServiceAdapterExpectTest.java    | 2 --
 .../cloudstack/compute/CloudStackComputeServiceLiveTest.java  | 2 --
 .../cloudstack/compute/CloudStackExperimentLiveTest.java      | 3 ---
 .../extensions/CloudStackImageExtensionExpectTest.java        | 4 ----
 .../compute/extensions/CloudStackImageExtensionLiveTest.java  | 3 ---
 .../CloudStackSecurityGroupExtensionExpectTest.java           | 4 ----
 .../extensions/CloudStackSecurityGroupExtensionLiveTest.java  | 3 ---
 .../functions/CloudStackSecurityGroupToSecurityGroupTest.java | 3 ---
 .../compute/functions/IngressRuleToIpPermissionTest.java      | 2 --
 .../compute/functions/ServiceOfferingToHardwareTest.java      | 1 -
 .../cloudstack/compute/functions/TemplateToImageTest.java     | 1 -
 .../compute/functions/TemplateToOperatingSystemTest.java      | 1 -
 .../compute/functions/VirtualMachineToNodeMetadataTest.java   | 3 ---
 .../cloudstack/compute/functions/ZoneToLocationTest.java      | 2 --
 .../cloudstack/compute/loaders/CreateUniqueKeyPairTest.java   | 4 ----
 .../compute/loaders/FindSecurityGroupOrCreateTest.java        | 4 ----
 .../compute/options/CloudStackTemplateOptionsTest.java        | 2 --
 .../org/jclouds/cloudstack/domain/VirtualMachineTest.java     | 2 --
 .../org/jclouds/cloudstack/features/AccountApiExpectTest.java | 2 --
 .../org/jclouds/cloudstack/features/AccountApiLiveTest.java   | 2 --
 .../java/org/jclouds/cloudstack/features/AccountApiTest.java  | 2 --
 .../org/jclouds/cloudstack/features/AddressApiLiveTest.java   | 2 --
 .../java/org/jclouds/cloudstack/features/AddressApiTest.java  | 2 --
 .../org/jclouds/cloudstack/features/AsyncJobApiLiveTest.java  | 2 --
 .../java/org/jclouds/cloudstack/features/AsyncJobApiTest.java | 2 --
 .../jclouds/cloudstack/features/ConfigurationApiLiveTest.java | 2 --
 .../org/jclouds/cloudstack/features/ConfigurationApiTest.java | 2 --
 .../jclouds/cloudstack/features/DomainAccountApiLiveTest.java | 2 --
 .../org/jclouds/cloudstack/features/DomainAccountApiTest.java | 2 --
 .../cloudstack/features/DomainDomainApiExpectTest.java        | 2 --
 .../jclouds/cloudstack/features/DomainDomainApiLiveTest.java  | 2 --
 .../jclouds/cloudstack/features/DomainLimitApiLiveTest.java   | 2 --
 .../org/jclouds/cloudstack/features/DomainLimitApiTest.java   | 2 --
 .../org/jclouds/cloudstack/features/EventApiLiveTest.java     | 2 --
 .../java/org/jclouds/cloudstack/features/EventApiTest.java    | 2 --
 .../jclouds/cloudstack/features/FirewallApiExpectTest.java    | 2 --
 .../org/jclouds/cloudstack/features/FirewallApiLiveTest.java  | 2 --
 .../java/org/jclouds/cloudstack/features/FirewallApiTest.java | 2 --
 .../jclouds/cloudstack/features/GlobalAccountApiLiveTest.java | 2 --
 .../org/jclouds/cloudstack/features/GlobalAccountApiTest.java | 2 --
 .../jclouds/cloudstack/features/GlobalAlertApiLiveTest.java   | 2 --
 .../org/jclouds/cloudstack/features/GlobalAlertApiTest.java   | 2 --
 .../cloudstack/features/GlobalCapacityApiLiveTest.java        | 2 --
 .../jclouds/cloudstack/features/GlobalCapacityApiTest.java    | 2 --
 .../cloudstack/features/GlobalConfigurationApiExpectTest.java | 2 --
 .../cloudstack/features/GlobalConfigurationApiLiveTest.java   | 2 --
 .../cloudstack/features/GlobalDomainApiExpectTest.java        | 2 --
 .../jclouds/cloudstack/features/GlobalDomainApiLiveTest.java  | 2 --
 .../jclouds/cloudstack/features/GlobalHostApiExpectTest.java  | 2 --
 .../jclouds/cloudstack/features/GlobalHostApiLiveTest.java    | 2 --
 .../org/jclouds/cloudstack/features/GlobalHostApiTest.java    | 2 --
 .../cloudstack/features/GlobalOfferingApiLiveTest.java        | 2 --
 .../jclouds/cloudstack/features/GlobalOfferingApiTest.java    | 2 --
 .../jclouds/cloudstack/features/GlobalPodApiExpectTest.java   | 2 --
 .../org/jclouds/cloudstack/features/GlobalPodApiLiveTest.java | 2 --
 .../cloudstack/features/GlobalStoragePoolApiLiveTest.java     | 2 --
 .../jclouds/cloudstack/features/GlobalStoragePoolApiTest.java | 2 --
 .../jclouds/cloudstack/features/GlobalUsageApiLiveTest.java   | 2 --
 .../org/jclouds/cloudstack/features/GlobalUsageApiTest.java   | 2 --
 .../jclouds/cloudstack/features/GlobalVlanApiExpectTest.java  | 2 --
 .../jclouds/cloudstack/features/GlobalVlanApiLiveTest.java    | 2 --
 .../jclouds/cloudstack/features/GlobalZoneApiExpectTest.java  | 2 --
 .../jclouds/cloudstack/features/GlobalZoneApiLiveTest.java    | 2 --
 .../org/jclouds/cloudstack/features/GuestOSApiLiveTest.java   | 2 --
 .../java/org/jclouds/cloudstack/features/GuestOSApiTest.java  | 2 --
 .../jclouds/cloudstack/features/HypervisorApiLiveTest.java    | 2 --
 .../org/jclouds/cloudstack/features/HypervisorApiTest.java    | 2 --
 .../org/jclouds/cloudstack/features/ISOApiExpectTest.java     | 2 --
 .../java/org/jclouds/cloudstack/features/ISOApiLiveTest.java  | 2 --
 .../test/java/org/jclouds/cloudstack/features/ISOApiTest.java | 1 -
 .../org/jclouds/cloudstack/features/LimitApiLiveTest.java     | 2 --
 .../java/org/jclouds/cloudstack/features/LimitApiTest.java    | 2 --
 .../jclouds/cloudstack/features/LoadBalancerApiLiveTest.java  | 2 --
 .../org/jclouds/cloudstack/features/LoadBalancerApiTest.java  | 2 --
 .../java/org/jclouds/cloudstack/features/NATApiLiveTest.java  | 2 --
 .../test/java/org/jclouds/cloudstack/features/NATApiTest.java | 2 --
 .../org/jclouds/cloudstack/features/NetworkApiLiveTest.java   | 2 --
 .../java/org/jclouds/cloudstack/features/NetworkApiTest.java  | 2 --
 .../org/jclouds/cloudstack/features/OfferingApiLiveTest.java  | 2 --
 .../java/org/jclouds/cloudstack/features/OfferingApiTest.java | 2 --
 .../org/jclouds/cloudstack/features/ProjectApiExpectTest.java | 2 --
 .../org/jclouds/cloudstack/features/ProjectApiLiveTest.java   | 2 --
 .../java/org/jclouds/cloudstack/features/ProjectApiTest.java  | 2 --
 .../jclouds/cloudstack/features/SSHKeyPairApiExpectTest.java  | 2 --
 .../jclouds/cloudstack/features/SSHKeyPairApiLiveTest.java    | 2 --
 .../org/jclouds/cloudstack/features/SSHKeyPairApiTest.java    | 2 --
 .../jclouds/cloudstack/features/SecurityGroupApiLiveTest.java | 2 --
 .../org/jclouds/cloudstack/features/SecurityGroupApiTest.java | 2 --
 .../org/jclouds/cloudstack/features/SessionApiExpectTest.java | 2 --
 .../org/jclouds/cloudstack/features/SessionApiLiveTest.java   | 2 --
 .../org/jclouds/cloudstack/features/SnapshotApiLiveTest.java  | 2 --
 .../java/org/jclouds/cloudstack/features/SnapshotApiTest.java | 1 -
 .../org/jclouds/cloudstack/features/TemplateApiLiveTest.java  | 2 --
 .../java/org/jclouds/cloudstack/features/TemplateApiTest.java | 2 --
 .../org/jclouds/cloudstack/features/VMGroupApiLiveTest.java   | 2 --
 .../java/org/jclouds/cloudstack/features/VMGroupApiTest.java  | 2 --
 .../cloudstack/features/VirtualMachineApiExpectTest.java      | 2 --
 .../cloudstack/features/VirtualMachineApiLiveTest.java        | 2 --
 .../jclouds/cloudstack/features/VirtualMachineApiTest.java    | 2 --
 .../org/jclouds/cloudstack/features/VolumeApiExpectTest.java  | 1 -
 .../org/jclouds/cloudstack/features/VolumeApiLiveTest.java    | 2 --
 .../java/org/jclouds/cloudstack/features/VolumeApiTest.java   | 2 --
 .../org/jclouds/cloudstack/features/ZoneApiExpectTest.java    | 2 --
 .../java/org/jclouds/cloudstack/features/ZoneApiLiveTest.java | 2 --
 .../java/org/jclouds/cloudstack/features/ZoneApiTest.java     | 2 --
 .../java/org/jclouds/cloudstack/filters/QuerySignerTest.java  | 2 --
 .../functions/BlockUntilJobCompletesAndReturnResultTest.java  | 3 ---
 .../cloudstack/functions/CreateSecurityGroupIfNeededTest.java | 3 ---
 .../functions/ParseAsyncJobFromHttpResponseTest.java          | 3 ---
 .../functions/ParseAsyncJobsFromHttpResponseTest.java         | 4 ----
 .../functions/ReuseOrAssociateNewPublicIPAddressTest.java     | 3 ---
 .../functions/StaticNATVirtualMachineInNetworkLiveTest.java   | 2 --
 .../WindowsLoginCredentialsFromEncryptedDataTest.java         | 3 ---
 .../cloudstack/handlers/CloudStackErrorHandlerTest.java       | 3 ---
 .../InvalidateSessionAndRetryOn401AndLogoutOnCloseTest.java   | 2 --
 .../cloudstack/internal/BaseCloudStackApiLiveTest.java        | 4 ----
 .../jclouds/cloudstack/internal/BaseCloudStackApiTest.java    | 3 ---
 .../BaseCloudStackComputeServiceContextExpectTest.java        | 1 -
 .../jclouds/cloudstack/internal/BaseCloudStackExpectTest.java | 2 --
 .../org/jclouds/cloudstack/options/AddClusterOptionsTest.java | 2 --
 .../org/jclouds/cloudstack/options/AddHostOptionsTest.java    | 2 --
 .../cloudstack/options/AddSecondaryStorageOptionsTest.java    | 2 --
 .../cloudstack/options/AssociateIPAddressOptionsTest.java     | 2 --
 .../jclouds/cloudstack/options/CreateAccountOptionsTest.java  | 2 --
 .../cloudstack/options/CreateDiskOfferingOptionsTest.java     | 2 --
 .../cloudstack/options/CreateIPForwardingRuleOptionsTest.java | 2 --
 .../jclouds/cloudstack/options/CreateNetworkOptionsTest.java  | 2 --
 .../org/jclouds/cloudstack/options/CreatePodOptionsTest.java  | 2 --
 .../cloudstack/options/CreateServiceOfferingOptionsTest.java  | 2 --
 .../org/jclouds/cloudstack/options/CreateUserOptionsTest.java | 2 --
 .../cloudstack/options/CreateVlanIPRangeOptionsTest.java      | 2 --
 .../org/jclouds/cloudstack/options/DeleteHostOptionsTest.java | 2 --
 .../cloudstack/options/GenerateUsageRecordsOptionsTest.java   | 2 --
 .../jclouds/cloudstack/options/ListAccountsOptionsTest.java   | 2 --
 .../org/jclouds/cloudstack/options/ListAlertsOptionsTest.java | 2 --
 .../jclouds/cloudstack/options/ListAsyncJobsOptionsTest.java  | 2 --
 .../jclouds/cloudstack/options/ListCapacityOptionsTest.java   | 2 --
 .../jclouds/cloudstack/options/ListClustersOptionsTest.java   | 2 --
 .../cloudstack/options/ListDiskOfferingsOptionsTest.java      | 2 --
 .../org/jclouds/cloudstack/options/ListHostsOptionsTest.java  | 2 --
 .../cloudstack/options/ListIPForwardingRulesOptionsTest.java  | 2 --
 .../org/jclouds/cloudstack/options/ListISOsOptionsTest.java   | 2 --
 .../cloudstack/options/ListLoadBalancerRulesOptionsTest.java  | 2 --
 .../cloudstack/options/ListNetworkOfferingsOptionsTest.java   | 2 --
 .../jclouds/cloudstack/options/ListNetworksOptionsTest.java   | 2 --
 .../jclouds/cloudstack/options/ListOSTypesOptionsTest.java    | 2 --
 .../org/jclouds/cloudstack/options/ListPodsOptionsTest.java   | 2 --
 .../options/ListPortForwardingRulesOptionsTest.java           | 2 --
 .../cloudstack/options/ListPublicIPAddressesOptionsTest.java  | 2 --
 .../cloudstack/options/ListSecurityGroupsOptionsTest.java     | 2 --
 .../cloudstack/options/ListServiceOfferingsOptionsTest.java   | 2 --
 .../cloudstack/options/ListStoragePoolsOptionsTest.java       | 2 --
 .../jclouds/cloudstack/options/ListTemplatesOptionsTest.java  | 2 --
 .../cloudstack/options/ListUsageRecordsOptionsTest.java       | 2 --
 .../org/jclouds/cloudstack/options/ListUsersOptionsTest.java  | 2 --
 .../cloudstack/options/ListVirtualMachesOptionsTest.java      | 2 --
 .../cloudstack/options/ListVlanIPRangesOptionsTest.java       | 2 --
 .../org/jclouds/cloudstack/options/ListZonesOptionsTest.java  | 2 --
 .../jclouds/cloudstack/options/UpdateAccountOptionsTest.java  | 2 --
 .../jclouds/cloudstack/options/UpdateClusterOptionsTest.java  | 2 --
 .../cloudstack/options/UpdateDiskOfferingOptionsTest.java     | 2 --
 .../org/jclouds/cloudstack/options/UpdateHostOptionsTest.java | 2 --
 .../cloudstack/options/UpdateNetworkOfferingOptionsTest.java  | 2 --
 .../org/jclouds/cloudstack/options/UpdatePodOptionsTest.java  | 2 --
 .../cloudstack/options/UpdateServiceOfferingOptionsTest.java  | 2 --
 .../org/jclouds/cloudstack/options/UpdateUserOptionsTest.java | 2 --
 .../cloudstack/parse/DeleteIPForwardingRuleResponseTest.java  | 4 ----
 .../jclouds/cloudstack/parse/DeleteNetworkResponseTest.java   | 4 ----
 .../cloudstack/parse/DeployVirtualMachineResponse3xTest.java  | 4 ----
 .../cloudstack/parse/DeployVirtualMachineResponse4xTest.java  | 4 ----
 .../cloudstack/parse/DisableStaticNATResponseTest.java        | 4 ----
 ...EnableStaticNATResponseWhereResponseDoesntHaveJobTest.java | 4 ----
 .../org/jclouds/cloudstack/parse/JobResultResponseTest.java   | 4 ----
 .../jclouds/cloudstack/parse/ListAccountsResponseTest.java    | 4 ----
 .../org/jclouds/cloudstack/parse/ListAlertsResponseTest.java  | 4 ----
 .../cloudstack/parse/ListCapabilitiesResponseTest.java        | 4 ----
 .../jclouds/cloudstack/parse/ListCapacityResponseTest.java    | 4 ----
 .../jclouds/cloudstack/parse/ListClustersResponseTest.java    | 3 ---
 .../parse/ListConfigurationEntriesResponseTest.java           | 3 ---
 .../cloudstack/parse/ListDiskOfferingsResponseTest.java       | 4 ----
 .../org/jclouds/cloudstack/parse/ListDomainsResponseTest.java | 3 ---
 .../cloudstack/parse/ListFirewallRulesResponseTest.java       | 4 ----
 .../org/jclouds/cloudstack/parse/ListHostsResponseTest.java   | 3 ---
 .../jclouds/cloudstack/parse/ListHypervisorsResponseTest.java | 4 ----
 .../cloudstack/parse/ListIPForwardingRulesResponseTest.java   | 4 ----
 .../cloudstack/parse/ListLoadBalancerRulesResponseTest.java   | 4 ----
 .../cloudstack/parse/ListNetworkOfferingsResponseTest.java    | 3 ---
 .../jclouds/cloudstack/parse/ListNetworksResponseTest.java    | 4 ----
 .../cloudstack/parse/ListOSCategoriesResponseTest.java        | 4 ----
 .../org/jclouds/cloudstack/parse/ListOSTypesResponseTest.java | 4 ----
 .../org/jclouds/cloudstack/parse/ListPodsResponseTest.java    | 4 ----
 .../cloudstack/parse/ListPortForwardingRulesResponseTest.java | 4 ----
 .../cloudstack/parse/ListPublicIPAddressesResponseTest.java   | 4 ----
 .../jclouds/cloudstack/parse/ListSSHKeyPairsResponseTest.java | 3 ---
 .../cloudstack/parse/ListSecurityGroupsResponseTest.java      | 4 ----
 .../cloudstack/parse/ListServiceOfferingsResponseTest.java    | 4 ----
 .../cloudstack/parse/ListStoragePoolsResponseTest.java        | 4 ----
 .../jclouds/cloudstack/parse/ListTemplatesResponseTest.java   | 4 ----
 .../cloudstack/parse/ListUsageRecordsResponseTest.java        | 4 ----
 .../cloudstack/parse/ListVirtualMachinesResponse3xTest.java   | 4 ----
 .../cloudstack/parse/ListVirtualMachinesResponseTest.java     | 4 ----
 .../cloudstack/parse/ListVlanIPRangesResponseTest.java        | 4 ----
 .../org/jclouds/cloudstack/parse/ListZonesResponseTest.java   | 4 ----
 .../cloudstack/parse/RegisterUserKeysResponseTest.java        | 3 ---
 .../org/jclouds/cloudstack/predicates/JobCompleteTest.java    | 3 ---
 .../jclouds/cloudstack/predicates/NetworkPredicatesTest.java  | 4 ----
 .../org/jclouds/cloudstack/predicates/OSCategoryInTest.java   | 3 ---
 .../cloudstack/predicates/PublicIPAddressPredicatesTest.java  | 4 ----
 .../cloudstack/predicates/SecurityGroupPredicatesTest.java    | 3 ---
 .../jclouds/cloudstack/predicates/TemplatePredicatesTest.java | 3 ---
 .../org/jclouds/cloudstack/predicates/UserPredicatesTest.java | 3 ---
 .../cloudstack/predicates/VirtualMachineDestroyedTest.java    | 3 ---
 .../cloudstack/predicates/VirtualMachineExpungedTest.java     | 3 ---
 .../cloudstack/predicates/VirtualMachineRunningTest.java      | 3 ---
 .../org/jclouds/cloudstack/predicates/ZonePredicatesTest.java | 3 ---
 .../src/main/java/org/jclouds/cloudwatch/CloudWatch.java      | 2 --
 .../src/main/java/org/jclouds/cloudwatch/CloudWatchApi.java   | 1 -
 .../java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java    | 2 --
 .../java/org/jclouds/cloudwatch/binders/AlarmNamesBinder.java | 2 --
 .../jclouds/cloudwatch/binders/GetMetricStatisticsBinder.java | 2 --
 .../java/org/jclouds/cloudwatch/binders/MetricDataBinder.java | 2 --
 .../jclouds/cloudwatch/config/CloudWatchHttpApiModule.java    | 2 --
 .../src/main/java/org/jclouds/cloudwatch/domain/Alarm.java    | 2 --
 .../java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java  | 2 --
 .../org/jclouds/cloudwatch/domain/AutoScalingConstants.java   | 2 --
 .../org/jclouds/cloudwatch/domain/ComparisonOperator.java     | 2 --
 .../main/java/org/jclouds/cloudwatch/domain/Datapoint.java    | 2 --
 .../main/java/org/jclouds/cloudwatch/domain/Dimension.java    | 2 --
 .../java/org/jclouds/cloudwatch/domain/DynamoDBConstants.java | 2 --
 .../main/java/org/jclouds/cloudwatch/domain/EBSConstants.java | 2 --
 .../main/java/org/jclouds/cloudwatch/domain/EC2Constants.java | 2 --
 .../main/java/org/jclouds/cloudwatch/domain/ELBConstants.java | 2 --
 .../main/java/org/jclouds/cloudwatch/domain/EMRConstants.java | 2 --
 .../org/jclouds/cloudwatch/domain/GetMetricStatistics.java    | 2 --
 .../cloudwatch/domain/GetMetricStatisticsResponse.java        | 2 --
 .../java/org/jclouds/cloudwatch/domain/HistoryItemType.java   | 2 --
 .../org/jclouds/cloudwatch/domain/ListMetricsResponse.java    | 2 --
 .../src/main/java/org/jclouds/cloudwatch/domain/Metric.java   | 2 --
 .../main/java/org/jclouds/cloudwatch/domain/MetricDatum.java  | 2 --
 .../main/java/org/jclouds/cloudwatch/domain/Namespaces.java   | 2 --
 .../main/java/org/jclouds/cloudwatch/domain/RDSConstants.java | 2 --
 .../main/java/org/jclouds/cloudwatch/domain/SNSConstants.java | 2 --
 .../main/java/org/jclouds/cloudwatch/domain/SQSConstants.java | 2 --
 .../java/org/jclouds/cloudwatch/domain/StatisticValues.java   | 2 --
 .../main/java/org/jclouds/cloudwatch/domain/Statistics.java   | 2 --
 .../jclouds/cloudwatch/domain/StorageGatewayConstants.java    | 2 --
 .../src/main/java/org/jclouds/cloudwatch/domain/Unit.java     | 2 --
 .../main/java/org/jclouds/cloudwatch/features/AlarmApi.java   | 1 -
 .../main/java/org/jclouds/cloudwatch/features/MetricApi.java  | 1 -
 .../java/org/jclouds/cloudwatch/functions/ISO8601Format.java  | 5 -----
 .../cloudwatch/functions/ListAlarmHistoryToPagedIterable.java | 3 ---
 .../cloudwatch/functions/ListAlarmsToPagedIterable.java       | 3 ---
 .../jclouds/cloudwatch/functions/MetricsToPagedIterable.java  | 3 ---
 .../jclouds/cloudwatch/handlers/CloudWatchErrorHandler.java   | 3 ---
 .../cloudwatch/options/GetMetricStatisticsOptions.java        | 1 -
 .../jclouds/cloudwatch/options/ListAlarmHistoryOptions.java   | 2 --
 .../org/jclouds/cloudwatch/options/ListAlarmsForMetric.java   | 2 --
 .../org/jclouds/cloudwatch/options/ListAlarmsOptions.java     | 2 --
 .../org/jclouds/cloudwatch/options/ListMetricsOptions.java    | 2 --
 .../java/org/jclouds/cloudwatch/options/SaveAlarmOptions.java | 2 --
 .../org/jclouds/cloudwatch/xml/AlarmHistoryItemHandler.java   | 2 --
 .../java/org/jclouds/cloudwatch/xml/DatapointHandler.java     | 4 ----
 .../java/org/jclouds/cloudwatch/xml/DimensionHandler.java     | 2 --
 .../cloudwatch/xml/GetMetricStatisticsResponseHandler.java    | 3 ---
 .../cloudwatch/xml/GetMetricStatisticsResponseHandlerV2.java  | 2 --
 .../cloudwatch/xml/ListAlarmHistoryResponseHandler.java       | 2 --
 .../cloudwatch/xml/ListAlarmsForMetricResponseHandler.java    | 2 --
 .../org/jclouds/cloudwatch/xml/ListAlarmsResponseHandler.java | 2 --
 .../jclouds/cloudwatch/xml/ListMetricsResponseHandler.java    | 2 --
 .../java/org/jclouds/cloudwatch/xml/MetricAlarmHandler.java   | 2 --
 .../main/java/org/jclouds/cloudwatch/xml/MetricHandler.java   | 2 --
 .../org/jclouds/cloudwatch/CloudWatchApiMetadataTest.java     | 4 ----
 .../test/java/org/jclouds/cloudwatch/CloudWatchLiveTest.java  | 2 --
 .../src/test/java/org/jclouds/cloudwatch/CloudWatchTest.java  | 2 --
 .../org/jclouds/cloudwatch/binders/AlarmNamesBinderTest.java  | 2 --
 .../org/jclouds/cloudwatch/binders/MetricDataBinderTest.java  | 2 --
 .../org/jclouds/cloudwatch/features/AlarmApiExpectTest.java   | 3 ---
 .../org/jclouds/cloudwatch/features/AlarmApiLiveTest.java     | 3 ---
 .../org/jclouds/cloudwatch/features/MetricApiExpectTest.java  | 3 ---
 .../org/jclouds/cloudwatch/features/MetricApiLiveTest.java    | 3 ---
 .../cloudwatch/internal/BaseCloudWatchApiExpectTest.java      | 4 ----
 .../cloudwatch/internal/BaseCloudWatchApiLiveTest.java        | 4 ----
 .../jclouds/cloudwatch/internal/BaseCloudWatchExpectTest.java | 4 ----
 .../cloudwatch/options/GetMetricStatisticsOptionsTest.java    | 2 --
 .../cloudwatch/options/ListAlarmHistoryOptionsTest.java       | 2 --
 .../jclouds/cloudwatch/options/ListAlarmsForMetricTest.java   | 2 --
 .../org/jclouds/cloudwatch/options/ListAlarmsOptionsTest.java | 2 --
 .../org/jclouds/cloudwatch/options/SaveAlarmOptionsTest.java  | 2 --
 .../xml/GetMetricStatisticsResponseHandlerTest.java           | 2 --
 .../cloudwatch/xml/ListAlarmHistoryResponseHandlerTest.java   | 2 --
 .../xml/ListAlarmsForMetricResponseHandlerTest.java           | 2 --
 .../jclouds/cloudwatch/xml/ListAlarmsResponseHandlerTest.java | 2 --
 apis/ec2/src/main/java/org/jclouds/ec2/EC2Api.java            | 2 --
 .../binders/BindBlockDeviceMappingToIndexedFormParams.java    | 4 ----
 .../jclouds/ec2/binders/BindBundleIdsToIndexedFormParams.java | 2 --
 .../jclouds/ec2/binders/BindFiltersToIndexedFormParams.java   | 2 --
 .../jclouds/ec2/binders/BindGroupIdsToIndexedFormParams.java  | 2 --
 .../ec2/binders/BindGroupNamesToIndexedFormParams.java        | 2 --
 .../ec2/binders/BindInstanceIdsToIndexedFormParams.java       | 2 --
 .../ec2/binders/BindIpPermissionToIndexedFormParams.java      | 3 ---
 .../ec2/binders/BindIpPermissionsToIndexedFormParams.java     | 3 ---
 .../jclouds/ec2/binders/BindKeyNamesToIndexedFormParams.java  | 2 --
 .../ec2/binders/BindProductCodesToIndexedFormParams.java      | 2 --
 .../jclouds/ec2/binders/BindPublicIpsToIndexedFormParams.java | 2 --
 .../ec2/binders/BindResourceIdsToIndexedFormParams.java       | 2 --
 .../jclouds/ec2/binders/BindS3UploadPolicyAndSignature.java   | 4 ----
 .../jclouds/ec2/binders/BindTagKeysToIndexedFormParams.java   | 2 --
 .../org/jclouds/ec2/binders/BindTagsToIndexedFormParams.java  | 3 ---
 .../ec2/binders/BindUserGroupsToIndexedFormParams.java        | 2 --
 .../BindUserIdGroupPairToSourceSecurityGroupFormParams.java   | 2 --
 .../jclouds/ec2/binders/BindUserIdsToIndexedFormParams.java   | 2 --
 .../jclouds/ec2/binders/BindVolumeIdsToIndexedFormParams.java | 2 --
 .../ec2/binders/IfNotNullBindAvailabilityZoneToFormParam.java | 2 --
 .../main/java/org/jclouds/ec2/compute/EC2ComputeService.java  | 3 ---
 .../org/jclouds/ec2/compute/EC2ComputeServiceContext.java     | 3 ---
 .../ec2/compute/config/EC2BindComputeStrategiesByClass.java   | 3 ---
 .../ec2/compute/config/EC2BindComputeSuppliersByClass.java    | 3 ---
 .../ec2/compute/config/EC2ComputeServiceContextModule.java    | 2 --
 .../compute/config/EC2ComputeServiceDependenciesModule.java   | 4 ----
 .../jclouds/ec2/compute/config/EC2ResolveImagesModule.java    | 3 ---
 .../org/jclouds/ec2/compute/domain/EC2HardwareBuilder.java    | 1 -
 .../jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java | 2 --
 .../java/org/jclouds/ec2/compute/domain/RegionAndName.java    | 4 ----
 .../jclouds/ec2/compute/domain/RegionNameAndIngressRules.java | 4 ----
 .../org/jclouds/ec2/compute/extensions/EC2ImageExtension.java | 3 ---
 .../ec2/compute/extensions/EC2SecurityGroupExtension.java     | 2 --
 .../ec2/compute/functions/AddElasticIpsToNodemetadata.java    | 2 --
 .../jclouds/ec2/compute/functions/CreateUniqueKeyPair.java    | 4 ----
 .../jclouds/ec2/compute/functions/CredentialsForInstance.java | 4 ----
 .../org/jclouds/ec2/compute/functions/EC2ImageParser.java     | 3 ---
 .../ec2/compute/functions/EC2SecurityGroupIdFromName.java     | 3 ---
 .../compute/functions/EC2SecurityGroupToSecurityGroup.java    | 2 --
 .../jclouds/ec2/compute/functions/ImagesToRegionAndIdMap.java | 3 ---
 .../functions/PasswordCredentialsFromWindowsInstance.java     | 3 ---
 .../org/jclouds/ec2/compute/functions/PresentInstances.java   | 2 --
 .../ec2/compute/functions/RunningInstanceToNodeMetadata.java  | 3 ---
 .../functions/WindowsLoginCredentialsFromEncryptedData.java   | 2 --
 .../ec2/compute/internal/EC2ComputeServiceContextImpl.java    | 3 ---
 .../jclouds/ec2/compute/internal/EC2TemplateBuilderImpl.java  | 4 ----
 .../ec2/compute/loaders/CreateSecurityGroupIfNeeded.java      | 4 ----
 .../ec2/compute/loaders/LoadPublicIpForInstanceOrNull.java    | 3 ---
 .../org/jclouds/ec2/compute/loaders/RegionAndIdToImage.java   | 4 ----
 .../org/jclouds/ec2/compute/options/EC2TemplateOptions.java   | 2 --
 .../jclouds/ec2/compute/predicates/EC2ImagePredicates.java    | 2 --
 .../jclouds/ec2/compute/predicates/SecurityGroupPresent.java  | 4 ----
 ...teKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java | 4 ----
 .../jclouds/ec2/compute/strategy/DescribeImagesParallel.java  | 4 ----
 .../compute/strategy/EC2CreateNodesInGroupThenAddToSet.java   | 2 --
 .../jclouds/ec2/compute/strategy/EC2DestroyNodeStrategy.java  | 4 ----
 .../org/jclouds/ec2/compute/strategy/EC2GetImageStrategy.java | 4 ----
 .../ec2/compute/strategy/EC2GetNodeMetadataStrategy.java      | 4 ----
 .../jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java    | 4 ----
 .../EC2PopulateDefaultLoginCredentialsForImageStrategy.java   | 3 ---
 .../jclouds/ec2/compute/strategy/EC2RebootNodeStrategy.java   | 4 ----
 .../jclouds/ec2/compute/strategy/EC2ResumeNodeStrategy.java   | 4 ----
 .../jclouds/ec2/compute/strategy/EC2SuspendNodeStrategy.java  | 4 ----
 .../org/jclouds/ec2/compute/strategy/ReviseParsedImage.java   | 4 ----
 .../jclouds/ec2/compute/suppliers/EC2HardwareSupplier.java    | 4 ----
 .../org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java   | 4 ----
 .../ec2/compute/suppliers/RegionAndNameToImageSupplier.java   | 4 ----
 .../java/org/jclouds/ec2/compute/util/EC2ComputeUtils.java    | 4 ----
 .../java/org/jclouds/ec2/config/BaseEC2HttpApiModule.java     | 2 --
 .../main/java/org/jclouds/ec2/config/EC2HttpApiModule.java    | 2 --
 apis/ec2/src/main/java/org/jclouds/ec2/domain/Attachment.java | 1 -
 .../java/org/jclouds/ec2/domain/AvailabilityZoneInfo.java     | 1 -
 .../ec2/src/main/java/org/jclouds/ec2/domain/BlockDevice.java | 1 -
 .../main/java/org/jclouds/ec2/domain/BlockDeviceMapping.java  | 4 ----
 .../java/org/jclouds/ec2/domain/BundleInstanceS3Storage.java  | 1 -
 apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleTask.java | 2 --
 apis/ec2/src/main/java/org/jclouds/ec2/domain/Hypervisor.java | 2 --
 apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java      | 1 -
 .../src/main/java/org/jclouds/ec2/domain/ImageAttribute.java  | 2 --
 .../src/main/java/org/jclouds/ec2/domain/InstanceState.java   | 2 --
 .../main/java/org/jclouds/ec2/domain/InstanceStateChange.java | 1 -
 .../src/main/java/org/jclouds/ec2/domain/InstanceType.java    | 2 --
 apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java    | 1 -
 .../src/main/java/org/jclouds/ec2/domain/PasswordData.java    | 2 --
 apis/ec2/src/main/java/org/jclouds/ec2/domain/Permission.java | 1 -
 .../java/org/jclouds/ec2/domain/PublicIpInstanceIdPair.java   | 1 -
 .../ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java | 1 -
 .../org/jclouds/ec2/domain/ReservedInstancesOffering.java     | 1 -
 .../src/main/java/org/jclouds/ec2/domain/RootDeviceType.java  | 2 --
 .../src/main/java/org/jclouds/ec2/domain/RunningInstance.java | 1 -
 .../src/main/java/org/jclouds/ec2/domain/SecurityGroup.java   | 1 -
 apis/ec2/src/main/java/org/jclouds/ec2/domain/Snapshot.java   | 1 -
 apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java     | 3 ---
 apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java        | 2 --
 .../src/main/java/org/jclouds/ec2/domain/UserIdGroupPair.java | 1 -
 .../main/java/org/jclouds/ec2/domain/VirtualizationType.java  | 2 --
 apis/ec2/src/main/java/org/jclouds/ec2/domain/Volume.java     | 2 --
 apis/ec2/src/main/java/org/jclouds/ec2/features/AMIApi.java   | 2 --
 .../jclouds/ec2/features/AvailabilityZoneAndRegionApi.java    | 2 --
 .../java/org/jclouds/ec2/features/ElasticBlockStoreApi.java   | 2 --
 .../java/org/jclouds/ec2/features/ElasticIPAddressApi.java    | 2 --
 .../src/main/java/org/jclouds/ec2/features/InstanceApi.java   | 2 --
 .../src/main/java/org/jclouds/ec2/features/KeyPairApi.java    | 2 --
 .../main/java/org/jclouds/ec2/features/SecurityGroupApi.java  | 2 --
 .../ec2/src/main/java/org/jclouds/ec2/features/SubnetApi.java | 2 --
 apis/ec2/src/main/java/org/jclouds/ec2/features/TagApi.java   | 1 -
 .../src/main/java/org/jclouds/ec2/features/WindowsApi.java    | 1 -
 .../functions/ConvertUnencodedBytesToBase64EncodedString.java | 2 --
 .../jclouds/ec2/functions/EncodedRSAPublicKeyToBase64.java    | 1 -
 .../jclouds/ec2/options/BundleInstanceS3StorageOptions.java   | 1 -
 .../main/java/org/jclouds/ec2/options/CreateImageOptions.java | 1 -
 .../java/org/jclouds/ec2/options/CreateSnapshotOptions.java   | 1 -
 .../jclouds/ec2/options/DescribeAvailabilityZonesOptions.java | 1 -
 .../java/org/jclouds/ec2/options/DescribeImagesOptions.java   | 1 -
 .../java/org/jclouds/ec2/options/DescribeRegionsOptions.java  | 1 -
 .../org/jclouds/ec2/options/DescribeSnapshotsOptions.java     | 1 -
 .../java/org/jclouds/ec2/options/DetachVolumeOptions.java     | 1 -
 .../jclouds/ec2/options/RegisterImageBackedByEbsOptions.java  | 1 -
 .../java/org/jclouds/ec2/options/RegisterImageOptions.java    | 1 -
 .../java/org/jclouds/ec2/options/RunInstancesOptions.java     | 1 -
 .../jclouds/ec2/options/internal/BaseEC2RequestOptions.java   | 4 ----
 .../java/org/jclouds/ec2/predicates/InstanceHasIpAddress.java | 2 --
 .../java/org/jclouds/ec2/predicates/InstanceStateRunning.java | 2 --
 .../java/org/jclouds/ec2/predicates/InstanceStateStopped.java | 2 --
 .../org/jclouds/ec2/predicates/InstanceStateTerminated.java   | 2 --
 .../java/org/jclouds/ec2/predicates/SnapshotCompleted.java    | 2 --
 .../main/java/org/jclouds/ec2/predicates/VolumeAttached.java  | 2 --
 .../main/java/org/jclouds/ec2/predicates/VolumeAvailable.java | 2 --
 .../main/java/org/jclouds/ec2/predicates/VolumeDetached.java  | 2 --
 .../src/main/java/org/jclouds/ec2/reference/EC2Constants.java | 2 --
 .../ec2/src/main/java/org/jclouds/ec2/util/IpPermissions.java | 2 --
 .../main/java/org/jclouds/ec2/util/SubnetFilterBuilder.java   | 2 --
 .../src/main/java/org/jclouds/ec2/util/TagFilterBuilder.java  | 1 -
 apis/ec2/src/main/java/org/jclouds/ec2/util/Tags.java         | 4 ----
 .../org/jclouds/ec2/xml/AllocateAddressResponseHandler.java   | 3 ---
 .../src/main/java/org/jclouds/ec2/xml/AttachmentHandler.java  | 4 ----
 .../main/java/org/jclouds/ec2/xml/BaseReservationHandler.java | 4 ----
 .../java/org/jclouds/ec2/xml/BlockDeviceMappingHandler.java   | 4 ----
 .../main/java/org/jclouds/ec2/xml/BooleanValueHandler.java    | 1 -
 .../src/main/java/org/jclouds/ec2/xml/BundleTaskHandler.java  | 4 ----
 .../java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java | 4 ----
 .../org/jclouds/ec2/xml/DescribeAddressesResponseHandler.java | 4 ----
 .../ec2/xml/DescribeAvailabilityZonesResponseHandler.java     | 4 ----
 .../jclouds/ec2/xml/DescribeBundleTasksResponseHandler.java   | 3 ---
 .../org/jclouds/ec2/xml/DescribeImagesResponseHandler.java    | 1 -
 .../org/jclouds/ec2/xml/DescribeInstancesResponseHandler.java | 1 -
 .../org/jclouds/ec2/xml/DescribeKeyPairsResponseHandler.java  | 1 -
 .../org/jclouds/ec2/xml/DescribeRegionsResponseHandler.java   | 4 ----
 .../ec2/xml/DescribeSecurityGroupsResponseHandler.java        | 1 -
 .../org/jclouds/ec2/xml/DescribeSnapshotsResponseHandler.java | 3 ---
 .../org/jclouds/ec2/xml/DescribeSubnetsResponseHandler.java   | 3 ---
 .../java/org/jclouds/ec2/xml/DescribeTagsResponseHandler.java | 2 --
 .../org/jclouds/ec2/xml/DescribeVolumesResponseHandler.java   | 3 ---
 .../org/jclouds/ec2/xml/GetConsoleOutputResponseHandler.java  | 1 -
 .../org/jclouds/ec2/xml/GetPasswordDataResponseHandler.java   | 3 ---
 .../ec2/src/main/java/org/jclouds/ec2/xml/ImageIdHandler.java | 1 -
 .../ec2/xml/InstanceInitiatedShutdownBehaviorHandler.java     | 1 -
 .../java/org/jclouds/ec2/xml/InstanceStateChangeHandler.java  | 1 -
 .../main/java/org/jclouds/ec2/xml/InstanceTypeHandler.java    | 1 -
 .../main/java/org/jclouds/ec2/xml/IpPermissionHandler.java    | 4 ----
 .../main/java/org/jclouds/ec2/xml/KeyPairResponseHandler.java | 1 -
 .../src/main/java/org/jclouds/ec2/xml/PermissionHandler.java  | 1 -
 .../java/org/jclouds/ec2/xml/RunInstancesResponseHandler.java | 1 -
 .../main/java/org/jclouds/ec2/xml/SecurityGroupHandler.java   | 3 ---
 .../src/main/java/org/jclouds/ec2/xml/SnapshotHandler.java    | 4 ----
 .../src/main/java/org/jclouds/ec2/xml/StringValueHandler.java | 1 -
 apis/ec2/src/main/java/org/jclouds/ec2/xml/SubnetHandler.java | 3 ---
 apis/ec2/src/main/java/org/jclouds/ec2/xml/TagHandler.java    | 2 --
 apis/ec2/src/main/java/org/jclouds/ec2/xml/TagSetHandler.java | 3 ---
 .../java/org/jclouds/ec2/xml/UnencodeStringValueHandler.java  | 1 -
 .../ec2/CloudApplicationArchitecturesEC2ApiLiveTest.java      | 2 --
 .../src/test/java/org/jclouds/ec2/EBSBootEC2ApiLiveTest.java  | 2 --
 .../ec2/src/test/java/org/jclouds/ec2/EC2ApiMetadataTest.java | 4 ----
 .../src/test/java/org/jclouds/ec2/EC2ContextBuilderText.java  | 3 ---
 .../BindBlockDeviceMappingToIndexedFormParamsTest.java        | 2 --
 .../ec2/binders/BindBundleIdsToIndexedFormParamsTest.java     | 2 --
 .../ec2/binders/BindFiltersToIndexedFormParamsTest.java       | 2 --
 .../ec2/binders/BindGroupNamesToIndexedFormParamsTest.java    | 2 --
 .../ec2/binders/BindInstanceIdsToIndexedFormParamsTest.java   | 2 --
 .../ec2/binders/BindKeyNamesToIndexedFormParamsTest.java      | 2 --
 .../ec2/binders/BindProductCodesToIndexedFormParamsTest.java  | 2 --
 .../ec2/binders/BindPublicIpsToIndexedFormParamsTest.java     | 2 --
 .../ec2/binders/BindResourceIdsToIndexedFormParamsTest.java   | 2 --
 .../ec2/binders/BindS3UploadPolicyAndSignatureTest.java       | 2 --
 .../ec2/binders/BindTagKeysToIndexedFormParamsTest.java       | 2 --
 .../jclouds/ec2/binders/BindTagsToIndexedFormParamsTest.java  | 2 --
 .../ec2/binders/BindUserGroupsToIndexedFormParamsTest.java    | 2 --
 ...indUserIdGroupPairToSourceSecurityGroupFormParamsTest.java | 2 --
 .../ec2/binders/BindUserIdsToIndexedFormParamsTest.java       | 2 --
 .../ec2/binders/BindVolumeIdsToIndexedFormParamsTest.java     | 2 --
 .../binders/IfNotNullBindAvailabilityZoneToFormParamTest.java | 2 --
 .../org/jclouds/ec2/compute/EC2ComputeServiceExpectTest.java  | 2 --
 .../org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java    | 4 ----
 .../java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java  | 2 --
 .../org/jclouds/ec2/compute/TestCanRecreateGroupLiveTest.java | 4 ----
 .../compute/config/EC2ComputeServiceContextModuleTest.java    | 3 ---
 .../ec2/compute/extensions/EC2ImageExtensionExpectTest.java   | 4 ----
 .../ec2/compute/extensions/EC2ImageExtensionLiveTest.java     | 3 ---
 .../extensions/EC2SecurityGroupExtensionExpectTest.java       | 4 ----
 .../compute/extensions/EC2SecurityGroupExtensionLiveTest.java | 3 ---
 .../compute/functions/AddElasticIpsToNodemetadataTest.java    | 3 ---
 .../ec2/compute/functions/CreateUniqueKeyPairTest.java        | 3 ---
 .../org/jclouds/ec2/compute/functions/EC2ImageParserTest.java | 3 ---
 .../functions/EC2SecurityGroupToSecurityGroupTest.java        | 3 ---
 .../jclouds/ec2/compute/functions/PresentInstancesTest.java   | 3 ---
 .../compute/functions/RunningInstanceToNodeMetadataTest.java  | 3 ---
 .../WindowsLoginCredentialsFromEncryptedDataTest.java         | 3 ---
 .../ec2/compute/internal/EC2TemplateBuilderImplTest.java      | 4 ----
 .../ec2/compute/loaders/CreateSecurityGroupIfNeededTest.java  | 3 ---
 .../compute/loaders/LoadPublicIpForInstanceOrNullTest.java    | 3 ---
 .../jclouds/ec2/compute/loaders/RegionAndIdToImageTest.java   | 3 ---
 .../jclouds/ec2/compute/options/EC2TemplateOptionsTest.java   | 2 --
 ...yPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java | 3 ---
 .../strategy/EC2CreateNodesInGroupThenAddToSetTest.java       | 3 ---
 .../ec2/compute/strategy/EC2DestroyNodeStrategyTest.java      | 3 ---
 .../org/jclouds/ec2/config/EC2HttpApiModuleExpectTest.java    | 3 ---
 .../test/java/org/jclouds/ec2/features/AMIApiExpectTest.java  | 3 ---
 .../test/java/org/jclouds/ec2/features/AMIApiLiveTest.java    | 2 --
 .../src/test/java/org/jclouds/ec2/features/AMIApiTest.java    | 2 --
 .../ec2/features/AvailabilityZoneAndRegionApiLiveTest.java    | 2 --
 .../ec2/features/AvailabilityZoneAndRegionApiTest.java        | 2 --
 .../test/java/org/jclouds/ec2/features/BaseEC2ApiTest.java    | 3 ---
 .../ec2/features/EC2ElasticBlockStoreApiExpectTest.java       | 3 ---
 .../jclouds/ec2/features/ElasticBlockStoreApiLiveTest.java    | 2 --
 .../org/jclouds/ec2/features/ElasticBlockStoreApiTest.java    | 2 --
 .../jclouds/ec2/features/ElasticIPAddressApiExpectTest.java   | 1 -
 .../org/jclouds/ec2/features/ElasticIPAddressApiLiveTest.java | 2 --
 .../org/jclouds/ec2/features/ElasticIPAddressApiTest.java     | 2 --
 .../java/org/jclouds/ec2/features/InstanceApiExpectTest.java  | 1 -
 .../java/org/jclouds/ec2/features/InstanceApiLiveTest.java    | 2 --
 .../test/java/org/jclouds/ec2/features/InstanceApiTest.java   | 2 --
 .../java/org/jclouds/ec2/features/KeyPairApiExpectTest.java   | 3 ---
 .../java/org/jclouds/ec2/features/KeyPairApiLiveTest.java     | 2 --
 .../test/java/org/jclouds/ec2/features/KeyPairApiTest.java    | 2 --
 .../org/jclouds/ec2/features/SecurityGroupApiExpectTest.java  | 3 ---
 .../org/jclouds/ec2/features/SecurityGroupApiLiveTest.java    | 2 --
 .../java/org/jclouds/ec2/features/SecurityGroupApiTest.java   | 2 --
 .../java/org/jclouds/ec2/features/SubnetApiExpectTest.java    | 3 ---
 .../test/java/org/jclouds/ec2/features/SubnetApiLiveTest.java | 3 ---
 .../test/java/org/jclouds/ec2/features/TagApiExpectTest.java  | 3 ---
 .../java/org/jclouds/ec2/features/WindowsApiExpectTest.java   | 3 ---
 .../java/org/jclouds/ec2/features/WindowsApiLiveTest.java     | 3 ---
 .../test/java/org/jclouds/ec2/features/WindowsApiTest.java    | 2 --
 .../org/jclouds/ec2/features/internal/BaseTagApiLiveTest.java | 2 --
 .../ConvertUnencodedBytesToBase64EncodedStringTest.java       | 2 --
 .../ec2/functions/EncodedRSAPublicKeyToBase64Test.java        | 2 --
 .../java/org/jclouds/ec2/internal/BaseEC2ApiLiveTest.java     | 4 ----
 .../ec2/options/BundleInstanceS3StorageOptionsTest.java       | 2 --
 .../java/org/jclouds/ec2/options/CreateImageOptionsTest.java  | 2 --
 .../org/jclouds/ec2/options/CreateSnapshotOptionsTest.java    | 2 --
 .../org/jclouds/ec2/options/DescribeImagesOptionsTest.java    | 2 --
 .../org/jclouds/ec2/options/DescribeSnapshotsOptionsTest.java | 2 --
 .../java/org/jclouds/ec2/options/DetachVolumeOptionsTest.java | 2 --
 .../ec2/options/RegisterImageBackedByEbsOptionsTest.java      | 2 --
 .../org/jclouds/ec2/options/RegisterImageOptionsTest.java     | 2 --
 .../java/org/jclouds/ec2/options/RunInstancesOptionsTest.java | 2 --
 .../org/jclouds/ec2/parse/DescribeSubnetsResponseTest.java    | 4 ----
 .../java/org/jclouds/ec2/parse/DescribeTagsResponseTest.java  | 3 ---
 .../org/jclouds/ec2/parse/GetPasswordDataResponseTest.java    | 3 ---
 .../java/org/jclouds/ec2/predicates/VolumeDetachedTest.java   | 3 ---
 .../ec2/suppliers/DescribeAvailabilityZonesInRegionTest.java  | 2 --
 .../src/test/java/org/jclouds/ec2/util/IpPermissionsTest.java | 2 --
 apis/ec2/src/test/java/org/jclouds/ec2/util/TagsTest.java     | 3 ---
 .../jclouds/ec2/xml/AllocateAddressResponseHandlerTest.java   | 2 --
 .../test/java/org/jclouds/ec2/xml/AttachmentHandlerTest.java  | 2 --
 .../src/test/java/org/jclouds/ec2/xml/BaseEC2HandlerTest.java | 4 ----
 .../org/jclouds/ec2/xml/BlockDeviceMappingHandlerTest.java    | 2 --
 .../test/java/org/jclouds/ec2/xml/BundleTaskHandlerTest.java  | 2 --
 .../org/jclouds/ec2/xml/CreateVolumeResponseHandlerTest.java  | 2 --
 .../jclouds/ec2/xml/DescribeAddressesResponseHandlerTest.java | 2 --
 .../ec2/xml/DescribeAvailabilityZonesResponseHandlerTest.java | 2 --
 .../ec2/xml/DescribeBundleTasksResponseHandlerTest.java       | 2 --
 .../jclouds/ec2/xml/DescribeImagesResponseHandlerTest.java    | 2 --
 .../org/jclouds/ec2/xml/DescribeInstanceAttributeTest.java    | 2 --
 .../jclouds/ec2/xml/DescribeInstancesResponseHandlerTest.java | 2 --
 .../jclouds/ec2/xml/DescribeKeyPairsResponseHandlerTest.java  | 2 --
 .../jclouds/ec2/xml/DescribeRegionsResponseHandlerTest.java   | 2 --
 .../ec2/xml/DescribeSecurityGroupsResponseHandlerTest.java    | 2 --
 .../jclouds/ec2/xml/DescribeSnapshotsResponseHandlerTest.java | 2 --
 .../jclouds/ec2/xml/DescribeVolumesResponseHandlerTest.java   | 2 --
 .../jclouds/ec2/xml/GetConsoleOutputResponseHandlerTest.java  | 2 --
 .../org/jclouds/ec2/xml/InstanceStateChangeHandlerTest.java   | 2 --
 .../java/org/jclouds/ec2/xml/KeyPairResponseHandlerTest.java  | 2 --
 .../test/java/org/jclouds/ec2/xml/PermissionHandlerTest.java  | 2 --
 .../org/jclouds/ec2/xml/RunInstancesResponseHandlerTest.java  | 2 --
 .../test/java/org/jclouds/ec2/xml/SnapshotHandlerTest.java    | 2 --
 .../main/java/org/jclouds/elasticstack/ElasticStackApi.java   | 1 -
 .../org/jclouds/elasticstack/ElasticStackApiMetadata.java     | 2 --
 .../elasticstack/binders/BindDriveDataToPlainTextString.java  | 4 ----
 .../elasticstack/binders/BindDriveToPlainTextString.java      | 4 ----
 .../elasticstack/binders/BindServerToPlainTextString.java     | 4 ----
 .../compute/ElasticStackComputeServiceAdapter.java            | 1 -
 .../config/ElasticStackComputeServiceContextModule.java       | 4 ----
 .../compute/functions/ServerInfoToNodeMetadata.java           | 4 ----
 .../compute/functions/StandardDriveToWellKnownImage.java      | 2 --
 .../elasticstack/compute/functions/WellKnownImageToImage.java | 3 ---
 .../elasticstack/config/ElasticStackHttpApiModule.java        | 2 --
 .../java/org/jclouds/elasticstack/domain/BlockDevice.java     | 4 ----
 .../main/java/org/jclouds/elasticstack/domain/ClaimType.java  | 2 --
 .../org/jclouds/elasticstack/domain/CreateDriveRequest.java   | 4 ----
 .../src/main/java/org/jclouds/elasticstack/domain/Device.java | 4 ----
 .../src/main/java/org/jclouds/elasticstack/domain/Drive.java  | 4 ----
 .../main/java/org/jclouds/elasticstack/domain/DriveData.java  | 4 ----
 .../main/java/org/jclouds/elasticstack/domain/DriveInfo.java  | 4 ----
 .../java/org/jclouds/elasticstack/domain/DriveMetrics.java    | 4 ----
 .../java/org/jclouds/elasticstack/domain/DriveStatus.java     | 4 ----
 .../main/java/org/jclouds/elasticstack/domain/IDEDevice.java  | 4 ----
 .../org/jclouds/elasticstack/domain/ImageConversionType.java  | 4 ----
 .../src/main/java/org/jclouds/elasticstack/domain/Item.java   | 4 ----
 .../main/java/org/jclouds/elasticstack/domain/MediaType.java  | 2 --
 .../src/main/java/org/jclouds/elasticstack/domain/Model.java  | 4 ----
 .../src/main/java/org/jclouds/elasticstack/domain/NIC.java    | 4 ----
 .../main/java/org/jclouds/elasticstack/domain/SCSIDevice.java | 4 ----
 .../src/main/java/org/jclouds/elasticstack/domain/Server.java | 4 ----
 .../main/java/org/jclouds/elasticstack/domain/ServerInfo.java | 4 ----
 .../java/org/jclouds/elasticstack/domain/ServerMetrics.java   | 4 ----
 .../java/org/jclouds/elasticstack/domain/ServerStatus.java    | 4 ----
 .../java/org/jclouds/elasticstack/domain/StandardDrive.java   | 3 ---
 .../src/main/java/org/jclouds/elasticstack/domain/VNC.java    | 4 ----
 .../java/org/jclouds/elasticstack/domain/WellKnownImage.java  | 4 ----
 .../org/jclouds/elasticstack/functions/BaseDriveToMap.java    | 4 ----
 .../elasticstack/functions/CreateDriveRequestToMap.java       | 4 ----
 .../org/jclouds/elasticstack/functions/DriveDataToMap.java    | 4 ----
 .../functions/KeyValuesDelimitedByBlankLinesToDriveInfo.java  | 4 ----
 .../functions/KeyValuesDelimitedByBlankLinesToServerInfo.java | 4 ----
 .../ListOfKeyValuesDelimitedByBlankLinesToDriveInfoSet.java   | 4 ----
 .../ListOfKeyValuesDelimitedByBlankLinesToListOfMaps.java     | 4 ----
 .../ListOfKeyValuesDelimitedByBlankLinesToServerInfoSet.java  | 4 ----
 ...istOfKeyValuesDelimitedByBlankLinesToStandardDriveSet.java | 3 ---
 .../ListOfMapsToListOfKeyValuesDelimitedByBlankLines.java     | 4 ----
 .../java/org/jclouds/elasticstack/functions/MapToDevices.java | 4 ----
 .../org/jclouds/elasticstack/functions/MapToDriveInfo.java    | 4 ----
 .../org/jclouds/elasticstack/functions/MapToDriveMetrics.java | 4 ----
 .../java/org/jclouds/elasticstack/functions/MapToNICs.java    | 3 ---
 .../org/jclouds/elasticstack/functions/MapToServerInfo.java   | 3 ---
 .../jclouds/elasticstack/functions/MapToServerMetrics.java    | 4 ----
 .../jclouds/elasticstack/functions/MapToStandardDrive.java    | 3 ---
 .../org/jclouds/elasticstack/functions/ReturnPayload.java     | 3 ---
 .../java/org/jclouds/elasticstack/functions/ServerToMap.java  | 3 ---
 .../org/jclouds/elasticstack/functions/SplitNewlines.java     | 4 ----
 .../elasticstack/handlers/ElasticStackErrorHandler.java       | 3 ---
 .../org/jclouds/elasticstack/predicates/DriveClaimed.java     | 4 ----
 .../jclouds/elasticstack/reference/ElasticStackConstants.java | 2 --
 .../elasticstack/suppliers/StandardDiskImageSupplier.java     | 3 ---
 .../elasticstack/suppliers/WellKnownImageSupplier.java        | 3 ---
 .../src/main/java/org/jclouds/elasticstack/util/Servers.java  | 4 ----
 .../org/jclouds/elasticstack/ElasticStackApiLiveTest.java     | 2 --
 .../org/jclouds/elasticstack/ElasticStackApiMetadataTest.java | 4 ----
 .../java/org/jclouds/elasticstack/ElasticStackApiTest.java    | 2 --
 .../java/org/jclouds/elasticstack/ElasticStackMockTest.java   | 2 --
 .../binders/BindDriveDataToPlainTextStringTest.java           | 4 ----
 .../elasticstack/binders/BindDriveToPlainTextStringTest.java  | 4 ----
 .../elasticstack/binders/BindServerToPlainTextStringTest.java | 4 ----
 .../compute/ElasticStackComputeServiceLiveTest.java           | 3 ---
 .../compute/functions/StandardDriveToWellKnownImageTest.java  | 2 --
 .../jclouds/elasticstack/functions/BaseDriveToMapTest.java    | 4 ----
 .../elasticstack/functions/CreateDriveRequestToMapTest.java   | 4 ----
 .../jclouds/elasticstack/functions/DriveDataToMapTest.java    | 4 ----
 .../KeyValuesDelimitedByBlankLinesToDriveInfoTest.java        | 4 ----
 .../KeyValuesDelimitedByBlankLinesToServerInfoTest.java       | 4 ----
 ...istOfKeyValuesDelimitedByBlankLinesToDriveInfoSetTest.java | 4 ----
 .../ListOfKeyValuesDelimitedByBlankLinesToListOfMapsTest.java | 4 ----
 ...stOfKeyValuesDelimitedByBlankLinesToServerInfoSetTest.java | 4 ----
 ...fKeyValuesDelimitedByBlankLinesToStandardDriveSetTest.java | 3 ---
 .../ListOfMapsToListOfKeyValuesDelimitedByBlankLinesTest.java | 4 ----
 .../jclouds/elasticstack/functions/MapToDriveInfoTest.java    | 4 ----
 .../jclouds/elasticstack/functions/MapToServerInfoTest.java   | 4 ----
 .../elasticstack/functions/MapToStandardDriveTest.java        | 3 ---
 .../org/jclouds/elasticstack/functions/ServerToMapTest.java   | 4 ----
 .../org/jclouds/elasticstack/functions/SplitNewlinesTest.java | 2 --
 .../elasticstack/handlers/ElasticStackErrorHandlerTest.java   | 4 ----
 .../elasticstack/suppliers/MockStandardDiskImageSupplier.java | 2 --
 .../java/org/jclouds/filesystem/FilesystemApiMetadata.java    | 2 --
 .../filesystem/config/FilesystemBlobStoreContextModule.java   | 4 ----
 .../predicates/validators/FilesystemBlobKeyValidator.java     | 2 --
 .../validators/FilesystemContainerNameValidator.java          | 2 --
 .../validators/internal/FilesystemBlobKeyValidatorImpl.java   | 2 --
 .../internal/FilesystemContainerNameValidatorImpl.java        | 2 --
 .../org/jclouds/filesystem/reference/FilesystemConstants.java | 2 --
 .../strategy/internal/FilesystemStorageStrategyImpl.java      | 4 ----
 .../src/main/java/org/jclouds/filesystem/util/Utils.java      | 2 --
 .../filesystem/util/internal/FileSystemBlobUtilsImpl.java     | 2 --
 .../org/jclouds/filesystem/FilesystemApiMetadataTest.java     | 4 ----
 .../org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java  | 2 --
 .../filesystem/integration/FilesystemBlobIntegrationTest.java | 5 -----
 .../integration/FilesystemContainerIntegrationTest.java       | 4 ----
 .../integration/FilesystemServiceIntegrationTestDisabled.java | 3 ---
 .../validators/internal/FilesystemBlobKeyValidatorTest.java   | 2 --
 .../internal/FilesystemContainerNameValidatorTest.java        | 2 --
 .../strategy/internal/FilesystemStorageStrategyImplTest.java  | 2 --
 .../src/test/java/org/jclouds/filesystem/utils/TestUtils.java | 2 --
 .../main/java/org/jclouds/openstack/cinder/v1/CinderApi.java  | 1 -
 .../org/jclouds/openstack/cinder/v1/CinderApiMetadata.java    | 2 --
 .../openstack/cinder/v1/config/CinderHttpApiModule.java       | 2 --
 .../openstack/cinder/v1/config/CinderParserModule.java        | 3 ---
 .../java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java | 2 --
 .../java/org/jclouds/openstack/cinder/v1/domain/Volume.java   | 2 --
 .../org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java   | 3 ---
 .../org/jclouds/openstack/cinder/v1/domain/VolumeType.java    | 2 --
 .../org/jclouds/openstack/cinder/v1/features/QuotaApi.java    | 1 -
 .../org/jclouds/openstack/cinder/v1/features/SnapshotApi.java | 1 -
 .../org/jclouds/openstack/cinder/v1/features/VolumeApi.java   | 1 -
 .../jclouds/openstack/cinder/v1/features/VolumeTypeApi.java   | 1 -
 .../openstack/cinder/v1/handlers/CinderErrorHandler.java      | 3 ---
 .../openstack/cinder/v1/options/CreateSnapshotOptions.java    | 3 ---
 .../openstack/cinder/v1/options/CreateVolumeOptions.java      | 3 ---
 .../openstack/cinder/v1/predicates/SnapshotPredicates.java    | 2 --
 .../openstack/cinder/v1/predicates/VolumePredicates.java      | 2 --
 .../openstack/cinder/v1/features/QuotasApiExpectTest.java     | 3 ---
 .../openstack/cinder/v1/features/QuotasApiLiveTest.java       | 3 ---
 .../openstack/cinder/v1/features/SnapshotApiExpectTest.java   | 2 --
 .../cinder/v1/features/VolumeAndSnapshotApiLiveTest.java      | 2 --
 .../openstack/cinder/v1/features/VolumeApiExpectTest.java     | 2 --
 .../openstack/cinder/v1/features/VolumeTypeApiExpectTest.java | 2 --
 .../openstack/cinder/v1/features/VolumeTypeApiLiveTest.java   | 2 --
 .../openstack/cinder/v1/internal/BaseCinderApiExpectTest.java | 2 --
 .../openstack/cinder/v1/internal/BaseCinderApiLiveTest.java   | 2 --
 .../openstack/cinder/v1/internal/BaseCinderExpectTest.java    | 2 --
 .../jclouds/openstack/keystone/v2_0/AuthenticationApi.java    | 1 -
 .../openstack/keystone/v2_0/AuthenticationAsyncApi.java       | 1 -
 .../java/org/jclouds/openstack/keystone/v2_0/KeystoneApi.java | 1 -
 .../jclouds/openstack/keystone/v2_0/KeystoneApiMetadata.java  | 2 --
 .../org/jclouds/openstack/keystone/v2_0/KeystoneAsyncApi.java | 1 -
 .../keystone/v2_0/binders/BindAuthToJsonPayload.java          | 5 -----
 .../openstack/keystone/v2_0/config/Authentication.java        | 5 -----
 .../keystone/v2_0/config/AuthenticationApiModule.java         | 4 ----
 .../openstack/keystone/v2_0/config/CredentialType.java        | 2 --
 .../openstack/keystone/v2_0/config/CredentialTypes.java       | 2 --
 .../keystone/v2_0/config/KeystoneAuthenticationModule.java    | 4 ----
 .../openstack/keystone/v2_0/config/KeystoneParserModule.java  | 3 ---
 .../openstack/keystone/v2_0/config/KeystoneProperties.java    | 2 --
 .../keystone/v2_0/config/KeystoneRestClientModule.java        | 2 --
 .../keystone/v2_0/config/MappedAuthenticationApiModule.java   | 1 -
 .../org/jclouds/openstack/keystone/v2_0/domain/Access.java    | 1 -
 .../keystone/v2_0/domain/ApiAccessKeyCredentials.java         | 1 -
 .../jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java   | 2 --
 .../org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java  | 1 -
 .../openstack/keystone/v2_0/domain/PasswordCredentials.java   | 1 -
 .../java/org/jclouds/openstack/keystone/v2_0/domain/Role.java | 1 -
 .../org/jclouds/openstack/keystone/v2_0/domain/Service.java   | 1 -
 .../org/jclouds/openstack/keystone/v2_0/domain/Tenant.java    | 1 -
 .../org/jclouds/openstack/keystone/v2_0/domain/Token.java     | 1 -
 .../java/org/jclouds/openstack/keystone/v2_0/domain/User.java | 1 -
 .../keystone/v2_0/extensions/ExtensionNamespaces.java         | 1 -
 .../openstack/keystone/v2_0/extensions/RoleAdminApi.java      | 1 -
 .../openstack/keystone/v2_0/extensions/RoleAdminAsyncApi.java | 1 -
 .../openstack/keystone/v2_0/extensions/ServiceAdminApi.java   | 1 -
 .../keystone/v2_0/extensions/ServiceAdminAsyncApi.java        | 1 -
 .../openstack/keystone/v2_0/extensions/TenantAdminApi.java    | 1 -
 .../keystone/v2_0/extensions/TenantAdminAsyncApi.java         | 1 -
 .../openstack/keystone/v2_0/extensions/UserAdminApi.java      | 1 -
 .../openstack/keystone/v2_0/extensions/UserAdminAsyncApi.java | 1 -
 .../jclouds/openstack/keystone/v2_0/features/ServiceApi.java  | 1 -
 .../openstack/keystone/v2_0/features/ServiceAsyncApi.java     | 1 -
 .../jclouds/openstack/keystone/v2_0/features/TenantApi.java   | 1 -
 .../openstack/keystone/v2_0/features/TenantAsyncApi.java      | 1 -
 .../jclouds/openstack/keystone/v2_0/features/TokenApi.java    | 1 -
 .../openstack/keystone/v2_0/features/TokenAsyncApi.java       | 1 -
 .../org/jclouds/openstack/keystone/v2_0/features/UserApi.java | 1 -
 .../openstack/keystone/v2_0/features/UserAsyncApi.java        | 1 -
 .../openstack/keystone/v2_0/filters/AuthenticateRequest.java  | 3 ---
 .../jclouds/openstack/keystone/v2_0/functions/AdminURL.java   | 3 ---
 .../keystone/v2_0/functions/EndpointToSupplierAdminURI.java   | 3 ---
 .../openstack/keystone/v2_0/functions/InternalURL.java        | 1 -
 .../keystone/v2_0/functions/RegionToAdminEndpointURI.java     | 3 ---
 .../keystone/v2_0/functions/internal/ParseServices.java       | 2 --
 .../keystone/v2_0/functions/internal/ParseTenants.java        | 2 --
 .../keystone/v2_0/functions/internal/ParseUsers.java          | 2 --
 .../keystone/v2_0/handlers/KeystoneErrorHandler.java          | 3 ---
 .../openstack/keystone/v2_0/handlers/RetryOnRenew.java        | 1 -
 .../openstack/keystone/v2_0/options/CreateTenantOptions.java  | 3 ---
 .../openstack/keystone/v2_0/options/CreateUserOptions.java    | 3 ---
 .../openstack/keystone/v2_0/options/UpdateTenantOptions.java  | 3 ---
 .../openstack/keystone/v2_0/options/UpdateUserOptions.java    | 3 ---
 .../keystone/v2_0/suppliers/RegionIdToAdminURISupplier.java   | 3 ---
 .../src/main/java/org/jclouds/openstack/v2_0/ServiceType.java | 3 ---
 .../org/jclouds/openstack/v2_0/config/InternalUrlModule.java  | 3 ---
 .../java/org/jclouds/openstack/v2_0/domain/Extension.java     | 1 -
 .../main/java/org/jclouds/openstack/v2_0/domain/Limit.java    | 3 ---
 .../main/java/org/jclouds/openstack/v2_0/domain/Limits.java   | 3 ---
 .../src/main/java/org/jclouds/openstack/v2_0/domain/Link.java | 1 -
 .../jclouds/openstack/v2_0/domain/PaginatedCollection.java    | 1 -
 .../java/org/jclouds/openstack/v2_0/domain/RateLimit.java     | 3 ---
 .../main/java/org/jclouds/openstack/v2_0/domain/Resource.java | 1 -
 .../org/jclouds/openstack/v2_0/features/ExtensionApi.java     | 1 -
 .../jclouds/openstack/v2_0/features/ExtensionAsyncApi.java    | 1 -
 ...nAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet.java | 3 ---
 .../org/jclouds/openstack/v2_0/options/PaginationOptions.java | 1 -
 .../openstack/v2_0/predicates/ExtensionPredicates.java        | 2 --
 .../org/jclouds/openstack/v2_0/predicates/LinkPredicates.java | 2 --
 .../org/jclouds/openstack/v2_0/reference/AuthHeaders.java     | 4 ----
 .../java/org/jclouds/openstack/v2_0/services/Compute.java     | 1 -
 .../java/org/jclouds/openstack/v2_0/services/Extension.java   | 1 -
 .../java/org/jclouds/openstack/v2_0/services/Identity.java    | 1 -
 .../main/java/org/jclouds/openstack/v2_0/services/Image.java  | 1 -
 .../java/org/jclouds/openstack/v2_0/services/ObjectStore.java | 1 -
 .../openstack/keystone/v2_0/KeystoneApiExpectTest.java        | 4 ----
 .../jclouds/openstack/keystone/v2_0/KeystoneApiLiveTest.java  | 2 --
 .../openstack/keystone/v2_0/config/CredentialTypesTest.java   | 3 ---
 .../keystone/v2_0/config/ProviderModuleExpectTest.java        | 2 --
 .../keystone/v2_0/extensions/RoleAdminApiLiveTest.java        | 2 --
 .../keystone/v2_0/extensions/RoleAdminApiMockTest.java        | 2 --
 .../keystone/v2_0/extensions/ServiceAdminApiLiveTest.java     | 2 --
 .../keystone/v2_0/extensions/ServiceAdminApiMockTest.java     | 2 --
 .../keystone/v2_0/extensions/TenantAdminApiLiveTest.java      | 2 --
 .../keystone/v2_0/extensions/TenantAdminApiMockTest.java      | 2 --
 .../keystone/v2_0/extensions/UserAdminApiLiveTest.java        | 2 --
 .../keystone/v2_0/extensions/UserAdminApiMockTest.java        | 2 --
 .../keystone/v2_0/features/ServiceApiExpectTest.java          | 2 --
 .../openstack/keystone/v2_0/features/ServiceApiLiveTest.java  | 2 --
 .../openstack/keystone/v2_0/features/TenantApiExpectTest.java | 2 --
 .../openstack/keystone/v2_0/features/TenantApiLiveTest.java   | 2 --
 .../openstack/keystone/v2_0/features/TokenApiExpectTest.java  | 2 --
 .../openstack/keystone/v2_0/features/TokenApiLiveTest.java    | 2 --
 .../openstack/keystone/v2_0/features/UserApiExpectTest.java   | 2 --
 .../openstack/keystone/v2_0/features/UserApiLiveTest.java     | 2 --
 .../openstack/keystone/v2_0/functions/AdminURLTest.java       | 3 ---
 .../openstack/keystone/v2_0/functions/InternalURLTest.java    | 1 -
 .../v2_0/functions/PublicURLOrInternalIfNullTest.java         | 3 ---
 .../keystone/v2_0/functions/ReturnRegionOrProviderTest.java   | 3 ---
 .../keystone/v2_0/functions/internal/ParseUsersTest.java      | 4 ----
 .../openstack/keystone/v2_0/handlers/RetryOnRenewTest.java    | 2 --
 .../keystone/v2_0/internal/BaseKeystoneApiLiveTest.java       | 2 --
 .../keystone/v2_0/internal/BaseKeystoneRestApiExpectTest.java | 2 --
 .../openstack/keystone/v2_0/internal/KeystoneFixture.java     | 2 --
 .../openstack/keystone/v2_0/parse/ParseAccessTest.java        | 3 ---
 .../openstack/keystone/v2_0/parse/ParseAdminAccessTest.java   | 3 ---
 .../keystone/v2_0/parse/ParseDevstackApiMetadataTest.java     | 3 ---
 .../openstack/keystone/v2_0/parse/ParseMinimalAccessTest.java | 3 ---
 .../keystone/v2_0/parse/ParseRackspaceAccessTest.java         | 3 ---
 .../keystone/v2_0/parse/ParseRackspaceApiMetadataTest.java    | 3 ---
 .../v2_0/parse/ParseRandomEndpointVersionAccessTest.java      | 3 ---
 .../LocationIdToURIFromAccessForTypeAndVersionTest.java       | 3 ---
 .../RegionIdToAdminURIFromAccessForTypeAndVersionTest.java    | 3 ---
 .../RegionIdToURIFromAccessForTypeAndVersionTest.java         | 3 ---
 .../suppliers/ZoneIdToURIFromAccessForTypeAndVersionTest.java | 3 ---
 .../openstack/v2_0/functions/ExtensionToNameSpaceTest.java    | 3 ---
 ...otationNamespaceEqualsAnyNamespaceInExtensionsSetTest.java | 3 ---
 .../openstack/v2_0/internal/BaseOpenStackMockTest.java        | 4 ----
 .../jclouds/openstack/v2_0/options/PaginationOptionsTest.java | 2 --
 .../openstack/v2_0/predicates/ExtensionPredicatesTest.java    | 4 ----
 .../jclouds/openstack/v2_0/predicates/LinkPredicatesTest.java | 4 ----
 .../main/java/org/jclouds/openstack/nova/ec2/NovaEC2Api.java  | 2 --
 .../nova/ec2/config/NovaEC2ComputeServiceContextModule.java   | 4 ----
 .../openstack/nova/ec2/config/NovaEC2HttpApiModule.java       | 5 -----
 .../openstack/nova/ec2/features/NovaEC2KeyPairApi.java        | 3 ---
 .../nova/ec2/loaders/NovaCreateSecurityGroupIfNeeded.java     | 4 ----
 .../openstack/nova/ec2/strategy/NovaReviseParsedImage.java    | 3 ---
 .../nova/ec2/xml/NovaCreateVolumeResponseHandler.java         | 4 ----
 .../nova/ec2/xml/NovaDescribeImagesResponseHandler.java       | 2 --
 .../jclouds/openstack/nova/ec2/NovaEC2ApiMetadataTest.java    | 4 ----
 .../jclouds/openstack/nova/ec2/NovaEC2ContextBuilderTest.java | 4 ----
 .../nova/ec2/compute/NovaEC2ComputeServiceLiveTest.java       | 4 ----
 .../openstack/nova/ec2/features/NovaEC2AMIApiExpectTest.java  | 3 ---
 .../openstack/nova/ec2/features/NovaEC2AMIApiLiveTest.java    | 4 ----
 .../features/NovaEC2AvailabilityZoneAndRegionApiLiveTest.java | 4 ----
 .../ec2/features/NovaEC2ElasticBlockStoreApiLiveTest.java     | 4 ----
 .../ec2/features/NovaEC2ElasticBlockStoreExpectApiTest.java   | 3 ---
 .../nova/ec2/features/NovaEC2ElasticIPAddressApiLiveTest.java | 4 ----
 .../nova/ec2/features/NovaEC2InstanceApiExpectTest.java       | 3 ---
 .../nova/ec2/features/NovaEC2InstanceApiLiveTest.java         | 4 ----
 .../nova/ec2/features/NovaEC2KeyPairApiExpectTest.java        | 3 ---
 .../nova/ec2/features/NovaEC2KeyPairApiLiveTest.java          | 2 --
 .../nova/ec2/features/NovaEC2SecurityGroupApiLiveTest.java    | 4 ----
 .../openstack/nova/ec2/features/NovaSubnetApiLiveTest.java    | 4 ----
 .../nova/ec2/strategy/NovaReviseParsedImageTest.java          | 3 ---
 .../main/java/org/jclouds/openstack/nova/v2_0/NovaApi.java    | 1 -
 .../java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java | 2 --
 .../java/org/jclouds/openstack/nova/v2_0/NovaAsyncApi.java    | 1 -
 .../openstack/nova/v2_0/binders/BindKeyPairToJsonPayload.java | 4 ----
 .../nova/v2_0/binders/BindMetadataToJsonPayload.java          | 4 ----
 .../nova/v2_0/binders/BindSecurityGroupRuleToJsonPayload.java | 5 -----
 .../openstack/nova/v2_0/compute/NovaComputeService.java       | 3 ---
 .../nova/v2_0/compute/NovaComputeServiceAdapter.java          | 2 --
 .../v2_0/compute/config/NovaComputeServiceContextModule.java  | 2 --
 .../nova/v2_0/compute/extensions/NovaImageExtension.java      | 3 ---
 .../v2_0/compute/extensions/NovaSecurityGroupExtension.java   | 2 --
 .../compute/functions/AllocateAndAddFloatingIpToNode.java     | 2 --
 .../v2_0/compute/functions/CreateSecurityGroupIfNeeded.java   | 4 ----
 .../nova/v2_0/compute/functions/FlavorInZoneToHardware.java   | 2 --
 .../nova/v2_0/compute/functions/ImageInZoneToImage.java       | 2 --
 .../nova/v2_0/compute/functions/ImageToOperatingSystem.java   | 2 --
 .../functions/NovaSecurityGroupInZoneToSecurityGroup.java     | 2 --
 .../compute/functions/NovaSecurityGroupToSecurityGroup.java   | 2 --
 .../nova/v2_0/compute/functions/OrphanedGroupsByZoneId.java   | 4 ----
 .../functions/RemoveFloatingIpFromNodeAndDeallocate.java      | 2 --
 .../compute/functions/SecurityGroupRuleToIpPermission.java    | 2 --
 .../v2_0/compute/functions/ServerInZoneToNodeMetadata.java    | 2 --
 .../nova/v2_0/compute/loaders/CreateUniqueKeyPair.java        | 3 ---
 .../nova/v2_0/compute/loaders/FindSecurityGroupOrCreate.java  | 4 ----
 .../nova/v2_0/compute/loaders/LoadFloatingIpsForInstance.java | 2 --
 .../nova/v2_0/compute/options/NovaTemplateOptions.java        | 2 --
 .../v2_0/compute/predicates/AllNodesInGroupTerminated.java    | 3 ---
 ...ptionsCreateNodesWithGroupEncodedIntoNameThenAddToSet.java | 4 ----
 .../jclouds/openstack/nova/v2_0/config/NovaParserModule.java  | 4 ----
 .../jclouds/openstack/nova/v2_0/config/NovaProperties.java    | 2 --
 .../openstack/nova/v2_0/config/NovaRestClientModule.java      | 2 --
 .../java/org/jclouds/openstack/nova/v2_0/domain/Address.java  | 1 -
 .../org/jclouds/openstack/nova/v2_0/domain/BackupType.java    | 3 ---
 .../java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java   | 1 -
 .../org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java    | 2 --
 .../java/org/jclouds/openstack/nova/v2_0/domain/Image.java    | 2 --
 .../java/org/jclouds/openstack/nova/v2_0/domain/Ingress.java  | 1 -
 .../java/org/jclouds/openstack/nova/v2_0/domain/Network.java  | 1 -
 .../org/jclouds/openstack/nova/v2_0/domain/RebootType.java    | 4 ----
 .../java/org/jclouds/openstack/nova/v2_0/domain/Server.java   | 2 --
 .../org/jclouds/openstack/nova/v2_0/domain/ServerCreated.java | 1 -
 .../openstack/nova/v2_0/domain/ServerExtendedAttributes.java  | 1 -
 .../openstack/nova/v2_0/domain/ServerExtendedStatus.java      | 1 -
 .../openstack/nova/v2_0/domain/ServerWithSecurityGroups.java  | 1 -
 .../jclouds/openstack/nova/v2_0/domain/SimpleServerUsage.java | 1 -
 .../jclouds/openstack/nova/v2_0/domain/SimpleTenantUsage.java | 1 -
 .../jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java   | 1 -
 .../jclouds/openstack/nova/v2_0/domain/VirtualInterface.java  | 1 -
 .../nova/v2_0/domain/zonescoped/AvailabilityZone.java         | 3 ---
 .../openstack/nova/v2_0/domain/zonescoped/FlavorInZone.java   | 3 ---
 .../openstack/nova/v2_0/domain/zonescoped/ImageInZone.java    | 3 ---
 .../nova/v2_0/domain/zonescoped/SecurityGroupInZone.java      | 3 ---
 .../openstack/nova/v2_0/domain/zonescoped/ServerInZone.java   | 3 ---
 .../openstack/nova/v2_0/domain/zonescoped/ZoneAndId.java      | 3 ---
 .../openstack/nova/v2_0/domain/zonescoped/ZoneAndName.java    | 2 --
 .../v2_0/domain/zonescoped/ZoneSecurityGroupNameAndPorts.java | 3 ---
 .../openstack/nova/v2_0/domain/zonescoped/ZoneState.java      | 3 ---
 .../openstack/nova/v2_0/extensions/AvailabilityZoneAPI.java   | 3 ---
 .../nova/v2_0/extensions/AvailabilityZoneAsyncApi.java        | 3 ---
 .../openstack/nova/v2_0/extensions/ExtensionNamespaces.java   | 1 -
 .../openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java   | 1 -
 .../nova/v2_0/extensions/FlavorExtraSpecsAsyncApi.java        | 1 -
 .../jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java | 1 -
 .../openstack/nova/v2_0/extensions/FloatingIPAsyncApi.java    | 1 -
 .../openstack/nova/v2_0/extensions/HostAdministrationApi.java | 1 -
 .../nova/v2_0/extensions/HostAdministrationAsyncApi.java      | 1 -
 .../openstack/nova/v2_0/extensions/HostAggregateApi.java      | 1 -
 .../openstack/nova/v2_0/extensions/HostAggregateAsyncApi.java | 1 -
 .../jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java    | 1 -
 .../openstack/nova/v2_0/extensions/KeyPairAsyncApi.java       | 1 -
 .../org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java  | 1 -
 .../jclouds/openstack/nova/v2_0/extensions/QuotaAsyncApi.java | 1 -
 .../openstack/nova/v2_0/extensions/SecurityGroupApi.java      | 1 -
 .../openstack/nova/v2_0/extensions/SecurityGroupAsyncApi.java | 1 -
 .../openstack/nova/v2_0/extensions/ServerAdminApi.java        | 1 -
 .../openstack/nova/v2_0/extensions/ServerAdminAsyncApi.java   | 1 -
 .../nova/v2_0/extensions/ServerWithSecurityGroupsApi.java     | 1 -
 .../v2_0/extensions/ServerWithSecurityGroupsAsyncApi.java     | 1 -
 .../openstack/nova/v2_0/extensions/SimpleTenantUsageApi.java  | 1 -
 .../nova/v2_0/extensions/SimpleTenantUsageAsyncApi.java       | 1 -
 .../openstack/nova/v2_0/extensions/VirtualInterfaceApi.java   | 1 -
 .../nova/v2_0/extensions/VirtualInterfaceAsyncApi.java        | 1 -
 .../org/jclouds/openstack/nova/v2_0/extensions/VolumeApi.java | 1 -
 .../openstack/nova/v2_0/extensions/VolumeAsyncApi.java        | 1 -
 .../openstack/nova/v2_0/extensions/VolumeAttachmentApi.java   | 1 -
 .../nova/v2_0/extensions/VolumeAttachmentAsyncApi.java        | 1 -
 .../jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java | 1 -
 .../openstack/nova/v2_0/extensions/VolumeTypeAsyncApi.java    | 1 -
 .../org/jclouds/openstack/nova/v2_0/features/FlavorApi.java   | 1 -
 .../jclouds/openstack/nova/v2_0/features/FlavorAsyncApi.java  | 4 +---
 .../org/jclouds/openstack/nova/v2_0/features/ImageApi.java    | 1 -
 .../jclouds/openstack/nova/v2_0/features/ImageAsyncApi.java   | 1 -
 .../org/jclouds/openstack/nova/v2_0/features/ServerApi.java   | 1 -
 .../jclouds/openstack/nova/v2_0/features/ServerAsyncApi.java  | 1 -
 .../openstack/nova/v2_0/functions/OverLimitParser.java        | 3 ---
 .../nova/v2_0/functions/ParseImageIdFromLocationHeader.java   | 2 --
 .../nova/v2_0/functions/internal/OnlyMetadataValueOrNull.java | 4 ----
 .../nova/v2_0/functions/internal/ParseDiagnostics.java        | 3 ---
 .../nova/v2_0/functions/internal/ParseFlavorDetails.java      | 2 --
 .../openstack/nova/v2_0/functions/internal/ParseFlavors.java  | 2 --
 .../nova/v2_0/functions/internal/ParseImageDetails.java       | 2 --
 .../openstack/nova/v2_0/functions/internal/ParseImages.java   | 2 --
 .../openstack/nova/v2_0/functions/internal/ParseKeyPairs.java | 4 ----
 .../nova/v2_0/functions/internal/ParseServerDetails.java      | 2 --
 .../openstack/nova/v2_0/functions/internal/ParseServers.java  | 2 --
 .../openstack/nova/v2_0/handlers/NovaErrorHandler.java        | 3 ---
 .../nova/v2_0/options/CreateBackupOfServerOptions.java        | 3 ---
 .../openstack/nova/v2_0/options/CreateServerOptions.java      | 5 -----
 .../openstack/nova/v2_0/options/CreateVolumeOptions.java      | 3 ---
 .../nova/v2_0/options/CreateVolumeSnapshotOptions.java        | 3 ---
 .../openstack/nova/v2_0/options/CreateVolumeTypeOptions.java  | 3 ---
 .../org/jclouds/openstack/nova/v2_0/options/ListOptions.java  | 1 -
 .../openstack/nova/v2_0/options/RebuildServerOptions.java     | 4 ----
 .../predicates/FindSecurityGroupWithNameAndReturnTrue.java    | 2 --
 .../openstack/nova/v2_0/predicates/ImagePredicates.java       | 2 --
 .../openstack/nova/v2_0/predicates/KeyPairPredicates.java     | 2 --
 .../nova/v2_0/predicates/SecurityGroupPredicates.java         | 2 --
 ...essKeyAndSecretKeyAndTenantIdAuthenticationExpectTest.java | 1 -
 ...ecretKeyAndTenantNamePropertyAuthenticationExpectTest.java | 1 -
 .../v2_0/AccessKeyAndSecretKeyAuthenticationExpectTest.java   | 1 -
 .../openstack/nova/v2_0/EndpointIdIsRandomExpectTest.java     | 2 --
 .../org/jclouds/openstack/nova/v2_0/NovaApiMetadataTest.java  | 4 ----
 .../openstack/nova/v2_0/PasswordAuthenticationExpectTest.java | 1 -
 .../v2_0/PasswordAuthenticationWithTenantNameExpectTest.java  | 1 -
 .../v2_0/compute/NovaComputeServiceAdapterExpectTest.java     | 2 --
 .../nova/v2_0/compute/NovaComputeServiceExpectTest.java       | 2 --
 .../nova/v2_0/compute/NovaComputeServiceLiveTest.java         | 4 ----
 .../v2_0/compute/extensions/NovaImageExtensionExpectTest.java | 4 ----
 .../v2_0/compute/extensions/NovaImageExtensionLiveTest.java   | 3 ---
 .../extensions/NovaSecurityGroupExtensionExpectTest.java      | 4 ----
 .../extensions/NovaSecurityGroupExtensionLiveTest.java        | 3 ---
 .../functions/AllocateAndAddFloatingIpToNodeExpectTest.java   | 2 --
 .../v2_0/compute/functions/FlavorInZoneToHardwareTest.java    | 2 --
 .../nova/v2_0/compute/functions/ImageInZoneToImageTest.java   | 2 --
 .../v2_0/compute/functions/ImageToOperatingSystemTest.java    | 2 --
 .../functions/NovaSecurityGroupInZoneToSecurityGroupTest.java | 3 ---
 .../functions/NovaSecurityGroupToSecurityGroupTest.java       | 3 ---
 .../v2_0/compute/functions/OrphanedGroupsByZoneIdTest.java    | 5 -----
 .../functions/SecurityGroupRuleToIpPermissionTest.java        | 2 --
 .../compute/functions/ServerInZoneToNodeMetadataTest.java     | 2 --
 .../nova/v2_0/compute/loaders/CreateUniqueKeyPairTest.java    | 3 ---
 .../v2_0/compute/loaders/FindSecurityGroupOrCreateTest.java   | 3 ---
 .../v2_0/compute/loaders/LoadFloatingIpsForInstanceTest.java  | 3 ---
 .../nova/v2_0/compute/options/NovaTemplateOptionsTest.java    | 2 --
 .../nova/v2_0/extensions/AdminActionsApiExpectTest.java       | 2 --
 .../nova/v2_0/extensions/AdminActionsApiLiveTest.java         | 2 --
 .../nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java   | 3 ---
 .../nova/v2_0/extensions/AvailabilityZonesApiLiveTest.java    | 3 ---
 .../nova/v2_0/extensions/FlavorExtraSpecsApiExpectTest.java   | 2 --
 .../nova/v2_0/extensions/FlavorExtraSpecsApiLiveTest.java     | 2 --
 .../nova/v2_0/extensions/FloatingIPApiExpectTest.java         | 2 --
 .../openstack/nova/v2_0/extensions/FloatingIPApiLiveTest.java | 2 --
 .../nova/v2_0/extensions/HostAdministrationApiExpectTest.java | 2 --
 .../nova/v2_0/extensions/HostAdministrationApiLiveTest.java   | 2 --
 .../nova/v2_0/extensions/HostAggregateApiExpectTest.java      | 2 --
 .../nova/v2_0/extensions/HostAggregateApiLiveTest.java        | 2 --
 .../openstack/nova/v2_0/extensions/KeyPairApiExpectTest.java  | 2 --
 .../openstack/nova/v2_0/extensions/KeyPairApiLiveTest.java    | 2 --
 .../openstack/nova/v2_0/extensions/QuotaApiExpectTest.java    | 2 --
 .../openstack/nova/v2_0/extensions/QuotaApiLiveTest.java      | 2 --
 .../nova/v2_0/extensions/SecurityGroupApiExpectTest.java      | 2 --
 .../nova/v2_0/extensions/SecurityGroupApiLiveTest.java        | 2 --
 .../extensions/ServerWithSecurityGroupsApiExpectTest.java     | 2 --
 .../v2_0/extensions/ServerWithSecurityGroupsApiLiveTest.java  | 2 --
 .../nova/v2_0/extensions/SimpleTenantUsageApiExpectTest.java  | 2 --
 .../nova/v2_0/extensions/SimpleTenantUsageApiLiveTest.java    | 2 --
 .../nova/v2_0/extensions/VirtualInterfaceApiExpectTest.java   | 2 --
 .../nova/v2_0/extensions/VirtualInterfaceApiLiveTest.java     | 2 --
 .../openstack/nova/v2_0/extensions/VolumeApiExpectTest.java   | 2 --
 .../openstack/nova/v2_0/extensions/VolumeApiLiveTest.java     | 2 --
 .../nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java   | 2 --
 .../nova/v2_0/extensions/VolumeAttachmentApiLiveTest.java     | 2 --
 .../nova/v2_0/extensions/VolumeTypeApiExpectTest.java         | 2 --
 .../openstack/nova/v2_0/extensions/VolumeTypeApiLiveTest.java | 2 --
 .../openstack/nova/v2_0/features/ExtensionApiExpectTest.java  | 2 --
 .../openstack/nova/v2_0/features/ExtensionApiLiveTest.java    | 2 --
 .../openstack/nova/v2_0/features/FlavorApiExpectTest.java     | 2 --
 .../openstack/nova/v2_0/features/FlavorApiLiveTest.java       | 2 --
 .../openstack/nova/v2_0/features/ImageApiExpectTest.java      | 2 --
 .../openstack/nova/v2_0/features/ImageApiLiveTest.java        | 2 --
 .../openstack/nova/v2_0/features/ServerApiExpectTest.java     | 2 --
 .../openstack/nova/v2_0/features/ServerApiLiveTest.java       | 3 ---
 .../nova/v2_0/functions/CreateSecurityGroupIfNeededTest.java  | 4 ----
 .../FindSecurityGroupWithNameAndReturnTrueExpectTest.java     | 4 ----
 .../openstack/nova/v2_0/functions/InternalURLLiveTest.java    | 1 -
 .../openstack/nova/v2_0/handlers/NovaErrorHandlerTest.java    | 4 ----
 .../openstack/nova/v2_0/internal/BaseNovaApiExpectTest.java   | 2 --
 .../openstack/nova/v2_0/internal/BaseNovaApiLiveTest.java     | 2 --
 .../internal/BaseNovaComputeServiceContextExpectTest.java     | 2 --
 .../nova/v2_0/internal/BaseNovaComputeServiceExpectTest.java  | 2 --
 .../openstack/nova/v2_0/internal/BaseNovaExpectTest.java      | 2 --
 .../parse/ParseComputeServiceTypicalSecurityGroupTest.java    | 4 ----
 .../openstack/nova/v2_0/parse/ParseCreateFlavorTest.java      | 1 -
 .../openstack/nova/v2_0/parse/ParseCreatedServerTest.java     | 3 ---
 .../nova/v2_0/parse/ParseExtensionListNormalTest.java         | 4 ----
 .../openstack/nova/v2_0/parse/ParseExtensionListTest.java     | 4 ----
 .../jclouds/openstack/nova/v2_0/parse/ParseExtensionTest.java | 3 ---
 .../openstack/nova/v2_0/parse/ParseFlavorListTest.java        | 4 ----
 .../jclouds/openstack/nova/v2_0/parse/ParseFlavorTest.java    | 3 ---
 .../openstack/nova/v2_0/parse/ParseFloatingIPListTest.java    | 4 ----
 .../openstack/nova/v2_0/parse/ParseFloatingIPTest.java        | 3 ---
 .../jclouds/openstack/nova/v2_0/parse/ParseImageListTest.java | 4 ----
 .../org/jclouds/openstack/nova/v2_0/parse/ParseImageTest.java | 3 ---
 .../openstack/nova/v2_0/parse/ParseKeyPairListTest.java       | 4 ----
 .../jclouds/openstack/nova/v2_0/parse/ParseKeyPairTest.java   | 4 ----
 .../openstack/nova/v2_0/parse/ParseMetadataItemTest.java      | 4 ----
 .../openstack/nova/v2_0/parse/ParseMetadataListTest.java      | 4 ----
 .../openstack/nova/v2_0/parse/ParseMetadataUpdateTest.java    | 4 ----
 .../openstack/nova/v2_0/parse/ParseSecurityGroupListTest.java | 4 ----
 .../openstack/nova/v2_0/parse/ParseSecurityGroupTest.java     | 4 ----
 .../nova/v2_0/parse/ParseServerDetailsEssexTest.java          | 3 ---
 .../nova/v2_0/parse/ParseServerDetailsStatesTest.java         | 3 ---
 .../openstack/nova/v2_0/parse/ParseServerDiagnostics.java     | 4 ----
 .../openstack/nova/v2_0/parse/ParseServerListTest.java        | 4 ----
 .../jclouds/openstack/nova/v2_0/parse/ParseServerTest.java    | 3 ---
 .../nova/v2_0/parse/ParseServerWithAllExtensionsTest.java     | 3 ---
 .../nova/v2_0/parse/ParseServerWithInternetAddressesTest.java | 3 ---
 .../v2_0/parse/PublicIpsInPrivateAddressBlockExpectTest.java  | 3 ---
 .../openstack/nova/v2_0/predicates/ImagePredicatesTest.java   | 4 ----
 .../nova/v2_0/predicates/SecurityGroupPredicatesTest.java     | 4 ----
 .../main/java/org/jclouds/openstack/trove/v1/TroveApi.java    | 1 -
 .../java/org/jclouds/openstack/trove/v1/TroveApiMetadata.java | 2 --
 .../openstack/trove/v1/binders/BindCreateDatabaseToJson.java  | 3 ---
 .../openstack/trove/v1/binders/BindCreateInstanceToJson.java  | 3 ---
 .../openstack/trove/v1/binders/BindCreateUserToJson.java      | 3 ---
 .../openstack/trove/v1/binders/BindGrantUserToJson.java       | 3 ---
 .../jclouds/openstack/trove/v1/config/TroveHttpApiModule.java | 2 --
 .../jclouds/openstack/trove/v1/config/TroveParserModule.java  | 3 ---
 .../java/org/jclouds/openstack/trove/v1/domain/Flavor.java    | 2 --
 .../java/org/jclouds/openstack/trove/v1/domain/Instance.java  | 3 ---
 .../main/java/org/jclouds/openstack/trove/v1/domain/User.java | 2 --
 .../org/jclouds/openstack/trove/v1/features/DatabaseApi.java  | 2 --
 .../org/jclouds/openstack/trove/v1/features/FlavorApi.java    | 2 --
 .../org/jclouds/openstack/trove/v1/features/InstanceApi.java  | 2 --
 .../java/org/jclouds/openstack/trove/v1/features/UserApi.java | 2 --
 .../openstack/trove/v1/filters/EncodeDotsForUserGet.java      | 3 ---
 .../trove/v1/functions/ParseDatabaseListForUser.java          | 2 --
 .../trove/v1/functions/ParsePasswordFromRootedInstance.java   | 2 --
 .../openstack/trove/v1/handlers/TroveErrorHandler.java        | 3 ---
 .../openstack/trove/v1/predicates/InstancePredicates.java     | 2 --
 .../java/org/jclouds/openstack/trove/v1/utils/TroveUtils.java | 1 -
 .../openstack/trove/v1/features/DatabaseApiExpectTest.java    | 2 --
 .../openstack/trove/v1/features/DatabaseApiLiveTest.java      | 3 ---
 .../openstack/trove/v1/features/FlavorApiExpectTest.java      | 2 --
 .../openstack/trove/v1/features/FlavorApiLiveTest.java        | 3 ---
 .../openstack/trove/v1/features/InstanceApiExpectTest.java    | 2 --
 .../openstack/trove/v1/features/InstanceApiLiveTest.java      | 3 ---
 .../openstack/trove/v1/features/UserApiExpectTest.java        | 2 --
 .../jclouds/openstack/trove/v1/features/UserApiLiveTest.java  | 3 ---
 .../openstack/trove/v1/internal/BaseTroveApiExpectTest.java   | 2 --
 .../openstack/trove/v1/internal/BaseTroveApiLiveTest.java     | 2 --
 .../openstack/trove/v1/internal/BaseTroveExpectTest.java      | 2 --
 .../jclouds/openstack/trove/v1/parse/ParseFlavorListTest.java | 4 ----
 .../openstack/trove/v1/parse/ParseInstanceListTest.java       | 4 ----
 .../jclouds/openstack/trove/v1/parse/ParseUserListTest.java   | 4 ----
 .../openstack/trove/v1/utils/TroveUtilsExpectTest.java        | 2 --
 .../java/org/jclouds/rackspace/clouddns/v1/CloudDNSApi.java   | 2 --
 .../jclouds/rackspace/clouddns/v1/CloudDNSApiMetadata.java    | 2 --
 .../org/jclouds/rackspace/clouddns/v1/CloudDNSExceptions.java | 2 --
 .../rackspace/clouddns/v1/binders/CreateReverseDNSToJSON.java | 3 ---
 .../clouddns/v1/binders/FormatAndContentsToJSON.java          | 3 ---
 .../rackspace/clouddns/v1/binders/UpdateDomainsToJSON.java    | 3 ---
 .../rackspace/clouddns/v1/binders/UpdateRecordsToJSON.java    | 2 --
 .../rackspace/clouddns/v1/binders/UpdateReverseDNSToJSON.java | 3 ---
 .../org/jclouds/rackspace/clouddns/v1/config/CloudDNS.java    | 2 --
 .../rackspace/clouddns/v1/config/CloudDNSHttpApiModule.java   | 2 --
 .../jclouds/rackspace/clouddns/v1/domain/CreateDomain.java    | 2 --
 .../jclouds/rackspace/clouddns/v1/domain/CreateSubdomain.java | 3 ---
 .../java/org/jclouds/rackspace/clouddns/v1/domain/Domain.java | 2 --
 .../java/org/jclouds/rackspace/clouddns/v1/domain/Job.java    | 1 -
 .../java/org/jclouds/rackspace/clouddns/v1/domain/Record.java | 3 ---
 .../jclouds/rackspace/clouddns/v1/domain/RecordDetail.java    | 3 ---
 .../org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java   | 2 --
 .../jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java    | 2 --
 .../org/jclouds/rackspace/clouddns/v1/features/DomainApi.java | 3 ---
 .../org/jclouds/rackspace/clouddns/v1/features/LimitApi.java  | 2 --
 .../org/jclouds/rackspace/clouddns/v1/features/RecordApi.java | 3 ---
 .../jclouds/rackspace/clouddns/v1/features/ReverseDNSApi.java | 2 --
 .../rackspace/clouddns/v1/functions/DomainFunctions.java      | 2 --
 .../clouddns/v1/functions/DomainsToPagedIterable.java         | 3 ---
 .../jclouds/rackspace/clouddns/v1/functions/ParseDomain.java  | 3 ---
 .../jclouds/rackspace/clouddns/v1/functions/ParseDomains.java | 3 ---
 .../org/jclouds/rackspace/clouddns/v1/functions/ParseJob.java | 3 ---
 .../rackspace/clouddns/v1/functions/ParseOnlyRecord.java      | 3 ---
 .../jclouds/rackspace/clouddns/v1/functions/ParseRecord.java  | 3 ---
 .../jclouds/rackspace/clouddns/v1/functions/ParseRecords.java | 3 ---
 .../rackspace/clouddns/v1/functions/ParseSubdomains.java      | 3 ---
 .../rackspace/clouddns/v1/functions/RecordFunctions.java      | 2 --
 .../clouddns/v1/functions/RecordsToPagedIterable.java         | 3 ---
 .../clouddns/v1/functions/SubdomainsToPagedIterable.java      | 3 ---
 .../rackspace/clouddns/v1/predicates/JobPredicates.java       | 2 --
 .../rackspace/clouddns/v1/features/CloudDNSApiExpectTest.java | 3 ---
 .../rackspace/clouddns/v1/features/DomainApiExpectTest.java   | 3 ---
 .../rackspace/clouddns/v1/features/DomainApiLiveTest.java     | 3 ---
 .../rackspace/clouddns/v1/features/LimitApiExpectTest.java    | 3 ---
 .../rackspace/clouddns/v1/features/LimitApiLiveTest.java      | 3 ---
 .../rackspace/clouddns/v1/features/RecordApiExpectTest.java   | 3 ---
 .../rackspace/clouddns/v1/features/RecordApiLiveTest.java     | 3 ---
 .../clouddns/v1/features/ReverseDNSApiExpectTest.java         | 3 ---
 .../rackspace/clouddns/v1/features/ReverseDNSApiLiveTest.java | 3 ---
 .../clouddns/v1/internal/BaseCloudDNSApiExpectTest.java       | 3 ---
 .../clouddns/v1/internal/BaseCloudDNSApiLiveTest.java         | 3 ---
 .../cloudidentity/v2_0/CloudIdentityApiMetadata.java          | 2 --
 .../cloudidentity/v2_0/CloudIdentityAuthenticationApi.java    | 1 -
 .../v2_0/CloudIdentityAuthenticationAsyncApi.java             | 1 -
 .../org/jclouds/rackspace/cloudidentity/v2_0/ServiceType.java | 2 --
 .../v2_0/config/CloudIdentityAuthenticationApiModule.java     | 4 ----
 .../v2_0/config/CloudIdentityAuthenticationModule.java        | 4 ----
 .../v2_0/config/CloudIdentityCredentialTypes.java             | 4 ----
 .../SyncToAsyncCloudIdentityAuthenticationApiModule.java      | 1 -
 .../cloudidentity/v2_0/domain/ApiKeyCredentials.java          | 1 -
 .../v2_0/functions/AuthenticateApiKeyCredentials.java         | 1 -
 .../rackspace/cloudidentity/v2_0/functions/DateParser.java    | 2 --
 .../cloudidentity/v2_0/CloudIdentityApiLiveTest.java          | 4 ----
 .../cloudidentity/v2_0/CloudIdentityApiMetadataTest.java      | 4 ----
 .../v2_0/features/CloudIdentityServiceApiLiveTest.java        | 4 ----
 .../cloudidentity/v2_0/internal/RackspaceFixture.java         | 3 ---
 .../cloudloadbalancers/v1/CloudLoadBalancersApi.java          | 2 --
 .../cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java  | 2 --
 .../v1/binders/BindMetadataToJsonPayload.java                 | 2 --
 .../v1/config/CloudLoadBalancersHttpApiModule.java            | 2 --
 .../rackspace/cloudloadbalancers/v1/domain/AccessRule.java    | 2 --
 .../cloudloadbalancers/v1/domain/AccessRuleWithId.java        | 2 --
 .../rackspace/cloudloadbalancers/v1/domain/AccountUsage.java  | 3 ---
 .../rackspace/cloudloadbalancers/v1/domain/AddNode.java       | 2 --
 .../cloudloadbalancers/v1/domain/ConnectionThrottle.java      | 2 --
 .../cloudloadbalancers/v1/domain/CreateLoadBalancer.java      | 2 --
 .../rackspace/cloudloadbalancers/v1/domain/HealthMonitor.java | 1 -
 .../cloudloadbalancers/v1/domain/HistoricalUsage.java         | 3 ---
 .../rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java  | 3 ---
 .../cloudloadbalancers/v1/domain/LoadBalancerInfo.java        | 3 ---
 .../cloudloadbalancers/v1/domain/LoadBalancerStats.java       | 3 ---
 .../cloudloadbalancers/v1/domain/LoadBalancerUsage.java       | 3 ---
 .../rackspace/cloudloadbalancers/v1/domain/Metadata.java      | 2 --
 .../jclouds/rackspace/cloudloadbalancers/v1/domain/Node.java  | 2 --
 .../rackspace/cloudloadbalancers/v1/domain/Protocol.java      | 3 ---
 .../cloudloadbalancers/v1/domain/SSLTermination.java          | 3 ---
 .../cloudloadbalancers/v1/domain/SourceAddresses.java         | 2 --
 .../cloudloadbalancers/v1/domain/UpdateLoadBalancer.java      | 2 --
 .../rackspace/cloudloadbalancers/v1/domain/UpdateNode.java    | 2 --
 .../rackspace/cloudloadbalancers/v1/domain/VirtualIP.java     | 2 --
 .../cloudloadbalancers/v1/domain/VirtualIPWithId.java         | 2 --
 .../v1/domain/internal/BaseLoadBalancer.java                  | 4 ----
 .../cloudloadbalancers/v1/domain/internal/BaseNode.java       | 2 --
 .../cloudloadbalancers/v1/features/AccessRuleApi.java         | 2 --
 .../cloudloadbalancers/v1/features/ConnectionApi.java         | 2 --
 .../cloudloadbalancers/v1/features/ContentCachingApi.java     | 2 --
 .../cloudloadbalancers/v1/features/ErrorPageApi.java          | 2 --
 .../cloudloadbalancers/v1/features/HealthMonitorApi.java      | 1 -
 .../cloudloadbalancers/v1/features/LoadBalancerApi.java       | 2 --
 .../rackspace/cloudloadbalancers/v1/features/NodeApi.java     | 2 --
 .../rackspace/cloudloadbalancers/v1/features/ReportApi.java   | 1 -
 .../cloudloadbalancers/v1/features/SSLTerminationApi.java     | 2 --
 .../cloudloadbalancers/v1/features/SessionPersistenceApi.java | 2 --
 .../cloudloadbalancers/v1/features/VirtualIPApi.java          | 2 --
 .../rackspace/cloudloadbalancers/v1/functions/ConvertLB.java  | 3 ---
 .../rackspace/cloudloadbalancers/v1/functions/DateParser.java | 2 --
 .../cloudloadbalancers/v1/functions/ParseAlgorithms.java      | 3 ---
 .../cloudloadbalancers/v1/functions/ParseLoadBalancer.java    | 3 ---
 .../v1/functions/ParseLoadBalancerUsages.java                 | 2 --
 .../cloudloadbalancers/v1/functions/ParseLoadBalancers.java   | 3 ---
 .../cloudloadbalancers/v1/functions/ParseMetadata.java        | 3 ---
 .../cloudloadbalancers/v1/functions/ParseNestedBoolean.java   | 3 ---
 .../cloudloadbalancers/v1/functions/ParseNestedString.java    | 3 ---
 .../rackspace/cloudloadbalancers/v1/functions/ParseNode.java  | 3 ---
 .../rackspace/cloudloadbalancers/v1/functions/ParseNodes.java | 2 --
 .../v1/functions/ParseSessionPersistence.java                 | 3 ---
 .../ParseCloudLoadBalancersErrorFromHttpResponse.java         | 5 -----
 .../CloudLoadBalancersBindLoadBalancerStrategiesByClass.java  | 3 ---
 .../config/CloudLoadBalancersLoadBalancerContextModule.java   | 2 --
 ...oudLoadBalancersLoadBalancerServiceDependenciesModule.java | 4 ----
 .../functions/LoadBalancerToLoadBalancerMetadata.java         | 4 ----
 .../CloudLoadBalancersDestroyLoadBalancerStrategy.java        | 4 ----
 .../CloudLoadBalancersGetLoadBalancerMetadataStrategy.java    | 4 ----
 .../strategy/CloudLoadBalancersListLoadBalancersStrategy.java | 4 ----
 .../strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java  | 4 ----
 .../rackspace/cloudloadbalancers/v1/options/ListOptions.java  | 1 -
 .../v1/predicates/LoadBalancerPredicates.java                 | 2 --
 .../v1/CloudLoadBalancersApiMetadataTest.java                 | 4 ----
 .../v1/features/AccessRuleApiExpectTest.java                  | 3 ---
 .../cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java | 3 ---
 .../v1/features/ConnectionApiExpectTest.java                  | 3 ---
 .../cloudloadbalancers/v1/features/ConnectionApiLiveTest.java | 3 ---
 .../v1/features/ContentCachingApiExpectTest.java              | 3 ---
 .../v1/features/ContentCachingApiLiveTest.java                | 3 ---
 .../v1/features/ErrorPageApiExpectTest.java                   | 3 ---
 .../cloudloadbalancers/v1/features/ErrorPageApiLiveTest.java  | 3 ---
 .../v1/features/HealthMonitorApiExpectTest.java               | 3 ---
 .../v1/features/HealthMonitorApiLiveTest.java                 | 3 ---
 .../v1/features/LoadBalancerApiExpectTest.java                | 3 ---
 .../v1/features/LoadBalancerApiLiveTest.java                  | 3 ---
 .../cloudloadbalancers/v1/features/NodeApiExpectTest.java     | 3 ---
 .../cloudloadbalancers/v1/features/NodeApiLiveTest.java       | 3 ---
 .../cloudloadbalancers/v1/features/ReportApiExpectTest.java   | 3 ---
 .../cloudloadbalancers/v1/features/ReportApiLiveTest.java     | 3 ---
 .../v1/features/SSLTerminationApiExpectTest.java              | 3 ---
 .../v1/features/SSLTerminationApiLiveTest.java                | 3 ---
 .../v1/features/SessionPersistenceApiExpectTest.java          | 3 ---
 .../v1/features/SessionPersistenceApiLiveTest.java            | 3 ---
 .../v1/features/VirtualIPApiExpectTest.java                   | 3 ---
 .../cloudloadbalancers/v1/features/VirtualIPApiLiveTest.java  | 3 ---
 .../v1/functions/ParseLoadBalancerTest.java                   | 4 ----
 .../v1/functions/ParseLoadBalancerWhenDeletedTest.java        | 4 ----
 .../v1/functions/ParseLoadBalancersTest.java                  | 4 ----
 .../ParseCloudLoadBalancersErrorFromHttpResponseTest.java     | 4 ----
 .../v1/internal/BaseCloudLoadBalancerApiExpectTest.java       | 2 --
 .../v1/internal/BaseCloudLoadBalancersApiLiveTest.java        | 4 ----
 .../cloudloadbalancers/v1/options/ListOptionsTest.java        | 2 --
 .../java/org/jclouds/route53/InvalidChangeBatchException.java | 2 --
 .../route53/src/main/java/org/jclouds/route53/Route53Api.java | 1 -
 .../src/main/java/org/jclouds/route53/Route53ApiMetadata.java | 2 --
 .../java/org/jclouds/route53/binders/BindChangeBatch.java     | 4 ----
 .../main/java/org/jclouds/route53/binders/BindNextRecord.java | 4 ----
 .../java/org/jclouds/route53/config/Route53HttpApiModule.java | 2 --
 .../src/main/java/org/jclouds/route53/domain/Change.java      | 3 ---
 .../src/main/java/org/jclouds/route53/domain/ChangeBatch.java | 4 ----
 .../src/main/java/org/jclouds/route53/domain/HostedZone.java  | 4 ----
 .../org/jclouds/route53/domain/HostedZoneAndNameServers.java  | 4 ----
 .../main/java/org/jclouds/route53/domain/NewHostedZone.java   | 4 ----
 .../java/org/jclouds/route53/domain/ResourceRecordSet.java    | 4 ----
 .../org/jclouds/route53/domain/ResourceRecordSetIterable.java | 4 ----
 .../main/java/org/jclouds/route53/features/HostedZoneApi.java | 1 -
 .../org/jclouds/route53/features/ResourceRecordSetApi.java    | 1 -
 .../java/org/jclouds/route53/filters/RestAuthentication.java  | 2 --
 .../jclouds/route53/functions/HostedZonesToPagedIterable.java | 3 ---
 .../functions/ResourceRecordSetIterableToPagedIterable.java   | 3 ---
 .../main/java/org/jclouds/route53/functions/SerializeRRS.java | 3 ---
 .../org/jclouds/route53/handlers/Route53ErrorHandler.java     | 3 ---
 .../org/jclouds/route53/predicates/HostedZonePredicates.java  | 2 --
 .../route53/predicates/ResourceRecordSetPredicates.java       | 2 --
 .../src/main/java/org/jclouds/route53/xml/ChangeHandler.java  | 2 --
 .../jclouds/route53/xml/CreateHostedZoneResponseHandler.java  | 2 --
 .../org/jclouds/route53/xml/GetHostedZoneResponseHandler.java | 2 --
 .../main/java/org/jclouds/route53/xml/HostedZoneHandler.java  | 4 ----
 .../org/jclouds/route53/xml/InvalidChangeBatchHandler.java    | 4 ----
 .../jclouds/route53/xml/ListHostedZonesResponseHandler.java   | 2 --
 .../route53/xml/ListResourceRecordSetsResponseHandler.java    | 2 --
 .../org/jclouds/route53/xml/ResourceRecordSetHandler.java     | 4 ----
 .../test/java/org/jclouds/route53/Route53ApiExpectTest.java   | 3 ---
 .../src/test/java/org/jclouds/route53/Route53ApiLiveTest.java | 3 ---
 .../test/java/org/jclouds/route53/Route53ApiMetadataTest.java | 4 ----
 .../org/jclouds/route53/features/HostedZoneApiExpectTest.java | 3 ---
 .../org/jclouds/route53/features/HostedZoneApiLiveTest.java   | 3 ---
 .../route53/features/ResourceRecordSetApiExpectTest.java      | 3 ---
 .../route53/features/ResourceRecordSetApiLiveTest.java        | 3 ---
 .../java/org/jclouds/route53/functions/SerializeRRSTest.java  | 3 ---
 .../org/jclouds/route53/handlers/Route53ErrorHandlerTest.java | 4 ----
 .../org/jclouds/route53/internal/BaseRoute53ApiLiveTest.java  | 4 ----
 .../org/jclouds/route53/internal/BaseRoute53ExpectTest.java   | 4 ----
 .../jclouds/route53/parse/CreateHostedZoneResponseTest.java   | 3 ---
 .../java/org/jclouds/route53/parse/GetChangeResponseTest.java | 3 ---
 .../org/jclouds/route53/parse/GetHostedZoneResponseTest.java  | 3 ---
 .../jclouds/route53/parse/InvalidChangeBatchResponseTest.java | 3 ---
 .../jclouds/route53/parse/ListHostedZonesResponseTest.java    | 3 ---
 .../route53/parse/ListResourceRecordSetsResponseTest.java     | 3 ---
 .../jclouds/route53/predicates/HostedZonePredicatesTest.java  | 4 ----
 .../route53/predicates/ResourceRecordSetPredicatesTest.java   | 4 ----
 apis/s3/src/main/java/org/jclouds/s3/S3.java                  | 2 --
 apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java       | 2 --
 apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java       | 2 --
 apis/s3/src/main/java/org/jclouds/s3/S3Client.java            | 2 --
 .../main/java/org/jclouds/s3/binders/BindACLToXMLPayload.java | 4 ----
 .../org/jclouds/s3/binders/BindAsHostPrefixIfConfigured.java  | 4 ----
 .../org/jclouds/s3/binders/BindBucketLoggingToXmlPayload.java | 4 ----
 .../jclouds/s3/binders/BindNoBucketLoggingToXmlPayload.java   | 4 ----
 .../java/org/jclouds/s3/binders/BindPayerToXmlPayload.java    | 5 -----
 .../org/jclouds/s3/binders/BindS3ObjectMetadataToRequest.java | 4 ----
 .../main/java/org/jclouds/s3/blobstore/S3AsyncBlobStore.java  | 1 -
 .../java/org/jclouds/s3/blobstore/S3BlobRequestSigner.java    | 4 ----
 .../src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java   | 4 ----
 .../java/org/jclouds/s3/blobstore/S3BlobStoreContext.java     | 3 ---
 .../jclouds/s3/blobstore/config/S3BlobStoreContextModule.java | 2 --
 .../java/org/jclouds/s3/blobstore/functions/BlobToObject.java | 3 ---
 .../jclouds/s3/blobstore/functions/BlobToObjectMetadata.java  | 3 ---
 .../jclouds/s3/blobstore/functions/BucketToResourceList.java  | 3 ---
 .../s3/blobstore/functions/BucketToResourceMetadata.java      | 3 ---
 .../blobstore/functions/CommonPrefixesToResourceMetadata.java | 3 ---
 .../s3/blobstore/functions/ContainerToBucketListOptions.java  | 3 ---
 .../s3/blobstore/functions/LocationFromBucketName.java        | 3 ---
 .../java/org/jclouds/s3/blobstore/functions/ObjectToBlob.java | 3 ---
 .../jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java  | 3 ---
 .../jclouds/s3/blobstore/internal/S3BlobStoreContextImpl.java | 3 ---
 .../src/main/java/org/jclouds/s3/config/S3ObjectModule.java   | 2 --
 .../src/main/java/org/jclouds/s3/config/S3ParserModule.java   | 5 -----
 .../main/java/org/jclouds/s3/config/S3RestClientModule.java   | 2 --
 apis/s3/src/main/java/org/jclouds/s3/config/package-info.java | 1 -
 .../main/java/org/jclouds/s3/domain/AccessControlList.java    | 1 -
 .../s3/src/main/java/org/jclouds/s3/domain/BucketLogging.java | 1 -
 .../src/main/java/org/jclouds/s3/domain/BucketMetadata.java   | 2 --
 .../main/java/org/jclouds/s3/domain/CannedAccessPolicy.java   | 2 --
 .../s3/src/main/java/org/jclouds/s3/domain/CanonicalUser.java | 1 -
 .../main/java/org/jclouds/s3/domain/ListBucketResponse.java   | 1 -
 .../java/org/jclouds/s3/domain/MutableObjectMetadata.java     | 1 -
 .../src/main/java/org/jclouds/s3/domain/ObjectMetadata.java   | 1 -
 .../java/org/jclouds/s3/domain/ObjectMetadataBuilder.java     | 2 --
 apis/s3/src/main/java/org/jclouds/s3/domain/Payer.java        | 1 -
 apis/s3/src/main/java/org/jclouds/s3/domain/S3Object.java     | 1 -
 .../jclouds/s3/domain/internal/BucketListObjectMetadata.java  | 2 --
 .../java/org/jclouds/s3/domain/internal/CopyObjectResult.java | 2 --
 .../jclouds/s3/domain/internal/ListBucketResponseImpl.java    | 5 -----
 .../jclouds/s3/domain/internal/MutableObjectMetadataImpl.java | 2 --
 .../java/org/jclouds/s3/domain/internal/S3ObjectImpl.java     | 2 --
 apis/s3/src/main/java/org/jclouds/s3/domain/package-info.java | 1 -
 ...etAlreadyOwnedByYouOrOperationAbortedWhenBucketExists.java | 4 ----
 .../org/jclouds/s3/filters/RequestAuthorizeSignature.java     | 2 --
 .../s3/src/main/java/org/jclouds/s3/filters/package-info.java | 1 -
 .../jclouds/s3/functions/AssignCorrectHostnameForBucket.java  | 4 ----
 .../java/org/jclouds/s3/functions/BindRegionToXmlPayload.java | 3 ---
 .../s3/functions/DefaultEndpointThenInvalidateRegion.java     | 4 ----
 .../java/org/jclouds/s3/functions/GetRegionForBucket.java     | 4 ----
 apis/s3/src/main/java/org/jclouds/s3/functions/ObjectKey.java | 4 ----
 .../s3/functions/ParseObjectFromHeadersAndHttpContent.java    | 1 -
 .../jclouds/s3/functions/ParseObjectMetadataFromHeaders.java  | 1 -
 .../src/main/java/org/jclouds/s3/functions/package-info.java  | 1 -
 .../org/jclouds/s3/handlers/ParseS3ErrorFromXmlContent.java   | 4 ----
 .../org/jclouds/s3/handlers/S3RedirectionRetryHandler.java    | 2 --
 .../main/java/org/jclouds/s3/options/CopyObjectOptions.java   | 1 -
 .../main/java/org/jclouds/s3/options/ListBucketOptions.java   | 1 -
 .../main/java/org/jclouds/s3/options/PutBucketOptions.java    | 1 -
 .../main/java/org/jclouds/s3/options/PutObjectOptions.java    | 3 ---
 .../s3/src/main/java/org/jclouds/s3/options/package-info.java | 1 -
 apis/s3/src/main/java/org/jclouds/s3/package-info.java        | 1 -
 .../jclouds/s3/predicates/validators/BucketNameValidator.java | 2 --
 .../src/main/java/org/jclouds/s3/reference/S3Constants.java   | 2 --
 apis/s3/src/main/java/org/jclouds/s3/reference/S3Headers.java | 2 --
 .../src/main/java/org/jclouds/s3/reference/package-info.java  | 1 -
 apis/s3/src/main/java/org/jclouds/s3/util/S3Utils.java        | 2 --
 apis/s3/src/main/java/org/jclouds/s3/util/package-info.java   | 1 -
 .../java/org/jclouds/s3/xml/AccessControlListHandler.java     | 1 -
 .../main/java/org/jclouds/s3/xml/BucketLoggingHandler.java    | 1 -
 .../src/main/java/org/jclouds/s3/xml/CopyObjectHandler.java   | 1 -
 .../main/java/org/jclouds/s3/xml/ListAllMyBucketsHandler.java | 1 -
 .../src/main/java/org/jclouds/s3/xml/ListBucketHandler.java   | 1 -
 .../java/org/jclouds/s3/xml/LocationConstraintHandler.java    | 1 -
 apis/s3/src/main/java/org/jclouds/s3/xml/PayerHandler.java    | 1 -
 apis/s3/src/main/java/org/jclouds/s3/xml/package-info.java    | 1 -
 .../test/java/org/jclouds/s3/PathBasedS3ClientExpectTest.java | 4 ----
 apis/s3/src/test/java/org/jclouds/s3/S3ApiMetadataTest.java   | 4 ----
 apis/s3/src/test/java/org/jclouds/s3/S3AsyncClientTest.java   | 2 --
 apis/s3/src/test/java/org/jclouds/s3/S3ClientExpectTest.java  | 4 ----
 apis/s3/src/test/java/org/jclouds/s3/S3ClientLiveTest.java    | 5 -----
 apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java    | 4 ----
 apis/s3/src/test/java/org/jclouds/s3/S3Test.java              | 2 --
 .../s3/binders/BindAsHostPrefixIfConfiguredNoPathTest.java    | 2 --
 .../jclouds/s3/binders/BindAsHostPrefixIfConfiguredTest.java  | 2 --
 .../jclouds/s3/binders/BindBucketLoggingToXmlPayloadTest.java | 2 --
 .../s3/binders/BindNoBucketLoggingToXmlPayloadTest.java       | 2 --
 .../jclouds/s3/binders/BindS3ObjectMetadataToRequestTest.java | 2 --
 .../java/org/jclouds/s3/blobstore/S3BlobSignerExpectTest.java | 2 --
 .../s3/blobstore/functions/BucketToContainerListOptions.java  | 3 ---
 .../s3/blobstore/functions/BucketsToStorageMetadataTest.java  | 2 --
 .../s3/blobstore/functions/LocationFromBucketNameTest.java    | 2 --
 .../jclouds/s3/blobstore/functions/ResourceToBucketList.java  | 3 ---
 .../s3/blobstore/integration/S3BlobIntegrationLiveTest.java   | 5 -----
 .../org/jclouds/s3/blobstore/integration/S3BlobLiveTest.java  | 5 -----
 .../s3/blobstore/integration/S3BlobSignerLiveTest.java        | 4 ----
 .../blobstore/integration/S3ContainerIntegrationLiveTest.java | 4 ----
 .../jclouds/s3/blobstore/integration/S3ContainerLiveTest.java | 4 ----
 .../blobstore/integration/S3ServiceIntegrationLiveTest.java   | 3 ---
 ...readyOwnedByYouOrOperationAbortedWhenBucketExistsTest.java | 3 ---
 .../org/jclouds/s3/filters/RequestAuthorizeSignatureTest.java | 2 --
 .../RequestAuthorizeSignatureWithSessionCredentialsTest.java  | 2 --
 .../s3/functions/AssignCorrectHostnameForBucketTest.java      | 2 --
 .../s3/functions/DefaultEndpointThenInvalidateRegionTest.java | 3 ---
 .../java/org/jclouds/s3/functions/GetRegionForBucketTest.java | 3 ---
 .../s3/functions/ParseObjectMetadataFromHeadersTest.java      | 3 ---
 .../jclouds/s3/handlers/ParseS3ErrorFromXmlContentTest.java   | 4 ----
 .../s3/handlers/S3RedirectionRetryHandlerExpectTest.java      | 4 ----
 .../java/org/jclouds/s3/internal/BaseS3AsyncClientTest.java   | 4 ----
 .../java/org/jclouds/s3/internal/BaseS3ClientExpectTest.java  | 4 ----
 .../test/java/org/jclouds/s3/internal/StubS3AsyncClient.java  | 3 ---
 .../java/org/jclouds/s3/options/CopyObjectOptionsTest.java    | 2 --
 .../java/org/jclouds/s3/options/ListBucketOptionsTest.java    | 2 --
 .../java/org/jclouds/s3/options/PutBucketOptionsTest.java     | 2 --
 .../java/org/jclouds/s3/options/PutObjectOptionsTest.java     | 2 --
 .../test/java/org/jclouds/s3/services/BucketsLiveTest.java    | 5 -----
 .../java/org/jclouds/s3/xml/AccessControlListHandlerTest.java | 2 --
 .../java/org/jclouds/s3/xml/BucketLoggingHandlerTest.java     | 2 --
 .../test/java/org/jclouds/s3/xml/CopyObjectHandlerTest.java   | 2 --
 .../test/java/org/jclouds/s3/xml/ListBucketHandlerTest.java   | 2 --
 .../s3/src/test/java/org/jclouds/s3/xml/PayerHandlerTest.java | 2 --
 apis/s3/src/test/java/org/jclouds/s3/xml/S3ParserTest.java    | 2 --
 apis/sqs/src/main/java/org/jclouds/sqs/SQS.java               | 2 --
 apis/sqs/src/main/java/org/jclouds/sqs/SQSApi.java            | 2 --
 apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java    | 2 --
 .../sqs/binders/BindAttributeNamesToIndexedFormParams.java    | 2 --
 ...MessageVisibilityBatchRequestEntryToIndexedFormParams.java | 3 ---
 ...BindDeleteMessageBatchRequestEntryToIndexedFormParams.java | 3 ---
 .../BindSendMessageBatchRequestEntryToIndexedFormParams.java  | 3 ---
 ...MessageBatchRequestEntryWithDelaysToIndexedFormParams.java | 3 ---
 .../main/java/org/jclouds/sqs/config/SQSHttpApiModule.java    | 2 --
 .../src/main/java/org/jclouds/sqs/config/SQSProperties.java   | 2 --
 apis/sqs/src/main/java/org/jclouds/sqs/domain/Action.java     | 1 -
 apis/sqs/src/main/java/org/jclouds/sqs/domain/Attribute.java  | 1 -
 apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchError.java | 2 --
 .../sqs/src/main/java/org/jclouds/sqs/domain/BatchResult.java | 2 --
 apis/sqs/src/main/java/org/jclouds/sqs/domain/Message.java    | 2 --
 .../src/main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java | 2 --
 .../src/main/java/org/jclouds/sqs/domain/QueueAttributes.java | 1 -
 .../src/main/java/org/jclouds/sqs/features/MessageApi.java    | 2 --
 apis/sqs/src/main/java/org/jclouds/sqs/features/Messages.java | 2 --
 .../src/main/java/org/jclouds/sqs/features/PermissionApi.java | 2 --
 apis/sqs/src/main/java/org/jclouds/sqs/features/QueueApi.java | 2 --
 .../java/org/jclouds/sqs/functions/MapToQueueAttributes.java  | 2 --
 .../org/jclouds/sqs/handlers/ParseSQSErrorFromXmlContent.java | 4 ----
 .../java/org/jclouds/sqs/handlers/SQSErrorRetryHandler.java   | 4 ----
 .../main/java/org/jclouds/sqs/options/CreateQueueOptions.java | 2 --
 .../main/java/org/jclouds/sqs/options/ListQueuesOptions.java  | 1 -
 .../java/org/jclouds/sqs/options/ReceiveMessageOptions.java   | 2 --
 .../main/java/org/jclouds/sqs/options/SendMessageOptions.java | 2 --
 apis/sqs/src/main/java/org/jclouds/sqs/package-info.java      | 1 -
 .../main/java/org/jclouds/sqs/reference/SQSParameters.java    | 1 -
 .../src/main/java/org/jclouds/sqs/reference/package-info.java | 1 -
 .../src/main/java/org/jclouds/sqs/xml/AttributesHandler.java  | 2 --
 .../src/main/java/org/jclouds/sqs/xml/BatchErrorHandler.java  | 2 --
 .../main/java/org/jclouds/sqs/xml/BatchResponseHandler.java   | 2 --
 .../sqs/xml/ChangeMessageVisibilityBatchResponseHandler.java  | 2 --
 .../jclouds/sqs/xml/DeleteMessageBatchResponseHandler.java    | 2 --
 apis/sqs/src/main/java/org/jclouds/sqs/xml/IdHandler.java     | 2 --
 .../sqs/src/main/java/org/jclouds/sqs/xml/MessageHandler.java | 2 --
 .../org/jclouds/sqs/xml/ReceiveMessageResponseHandler.java    | 2 --
 .../org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java   | 1 -
 .../java/org/jclouds/sqs/xml/RegexMessageIdAndMD5Handler.java | 1 -
 .../src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java  | 1 -
 .../org/jclouds/sqs/xml/SendMessageBatchResponseHandler.java  | 2 --
 .../jclouds/sqs/xml/SendMessageBatchResultEntryHandler.java   | 2 --
 .../org/jclouds/sqs/xml/TextFromSingleElementHandler.java     | 2 --
 apis/sqs/src/main/java/org/jclouds/sqs/xml/ValueHandler.java  | 2 --
 .../org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java   | 1 -
 .../sqs/src/test/java/org/jclouds/sqs/SQSApiMetadataTest.java | 4 ----
 apis/sqs/src/test/java/org/jclouds/sqs/SQSTest.java           | 2 --
 .../java/org/jclouds/sqs/features/BulkMessageApiLiveTest.java | 4 ----
 .../java/org/jclouds/sqs/features/MessageApiExpectTest.java   | 3 ---
 .../java/org/jclouds/sqs/features/MessageApiLiveTest.java     | 4 ----
 .../org/jclouds/sqs/features/PermissionApiExpectTest.java     | 3 ---
 .../java/org/jclouds/sqs/features/PermissionApiLiveTest.java  | 5 -----
 .../java/org/jclouds/sqs/features/QueueApiExpectTest.java     | 3 ---
 .../test/java/org/jclouds/sqs/features/QueueApiLiveTest.java  | 4 ----
 .../org/jclouds/sqs/functions/MapToQueueAttributesTest.java   | 3 ---
 .../org/jclouds/sqs/handlers/SQSErrorRetryHandlerTest.java    | 2 --
 .../java/org/jclouds/sqs/internal/BaseSQSApiExpectTest.java   | 4 ----
 .../java/org/jclouds/sqs/internal/BaseSQSApiLiveTest.java     | 4 ----
 .../test/java/org/jclouds/sqs/internal/BaseSQSExpectTest.java | 4 ----
 .../java/org/jclouds/sqs/options/CreateQueueOptionsTest.java  | 2 --
 .../java/org/jclouds/sqs/options/ListQueuesOptionsTest.java   | 2 --
 .../org/jclouds/sqs/options/ReceiveMessageOptionsTest.java    | 2 --
 .../java/org/jclouds/sqs/options/SendMessageOptionsTest.java  | 2 --
 .../sqs/parse/ChangeMessageVisibilityBatchResponseTest.java   | 3 ---
 .../java/org/jclouds/sqs/parse/CreateQueueResponseTest.java   | 3 ---
 .../org/jclouds/sqs/parse/DeleteMessageBatchResponseTest.java | 3 ---
 .../org/jclouds/sqs/parse/GetQueueAttributesResponseTest.java | 3 ---
 .../org/jclouds/sqs/parse/ReceiveMessageResponseTest.java     | 3 ---
 .../org/jclouds/sqs/parse/SendMessageBatchResponseTest.java   | 3 ---
 .../java/org/jclouds/sqs/parse/SendMessageResponseTest.java   | 3 ---
 .../src/main/java/org/jclouds/aws/AWSResponseException.java   | 2 --
 .../org/jclouds/aws/binders/BindMapToIndexedFormParams.java   | 3 ---
 .../org/jclouds/aws/binders/BindTableToIndexedFormParams.java | 3 ---
 .../main/java/org/jclouds/aws/config/AWSHttpApiModule.java    | 4 ----
 .../main/java/org/jclouds/aws/config/AWSRestClientModule.java | 1 -
 .../java/org/jclouds/aws/config/FormSigningHttpApiModule.java | 2 --
 .../org/jclouds/aws/config/FormSigningRestClientModule.java   | 4 ----
 .../aws/config/WithZonesFormSigningRestClientModule.java      | 4 ----
 apis/sts/src/main/java/org/jclouds/aws/domain/AWSError.java   | 2 --
 apis/sts/src/main/java/org/jclouds/aws/domain/Region.java     | 2 --
 .../main/java/org/jclouds/aws/domain/SessionCredentials.java  | 2 --
 .../sts/src/main/java/org/jclouds/aws/filters/FormSigner.java | 2 --
 .../org/jclouds/aws/handlers/AWSClientErrorRetryHandler.java  | 2 --
 .../org/jclouds/aws/handlers/AWSServerErrorRetryHandler.java  | 2 --
 .../org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java | 2 --
 .../src/main/java/org/jclouds/aws/handlers/package-info.java  | 1 -
 .../src/main/java/org/jclouds/aws/reference/AWSConstants.java | 2 --
 .../main/java/org/jclouds/aws/reference/FormParameters.java   | 1 -
 apis/sts/src/main/java/org/jclouds/aws/util/AWSUtils.java     | 2 --
 apis/sts/src/main/java/org/jclouds/aws/xml/ErrorHandler.java  | 1 -
 .../java/org/jclouds/aws/xml/SessionCredentialsHandler.java   | 2 --
 apis/sts/src/main/java/org/jclouds/sts/STSApi.java            | 1 -
 apis/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java    | 2 --
 .../main/java/org/jclouds/sts/config/STSHttpApiModule.java    | 2 --
 apis/sts/src/main/java/org/jclouds/sts/domain/User.java       | 3 ---
 .../org/jclouds/sts/domain/UserAndSessionCredentials.java     | 4 ----
 .../main/java/org/jclouds/sts/options/AssumeRoleOptions.java  | 2 --
 .../java/org/jclouds/sts/options/FederatedUserOptions.java    | 2 --
 .../org/jclouds/sts/options/SessionCredentialsOptions.java    | 2 --
 .../org/jclouds/sts/xml/UserAndSessionCredentialsHandler.java | 4 ----
 .../src/test/java/org/jclouds/aws/filters/FormSignerTest.java | 2 --
 .../jclouds/aws/handlers/AWSClientErrorRetryHandlerTest.java  | 2 --
 .../jclouds/aws/handlers/AWSServerErrorRetryHandlerTest.java  | 2 --
 .../jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java | 4 ----
 apis/sts/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java | 2 --
 .../src/test/java/org/jclouds/aws/xml/ErrorHandlerTest.java   | 2 --
 .../org/jclouds/aws/xml/SessionCredentialsHandlerTest.java    | 3 ---
 apis/sts/src/test/java/org/jclouds/sts/STSApiExpectTest.java  | 3 ---
 apis/sts/src/test/java/org/jclouds/sts/STSApiLiveTest.java    | 3 ---
 .../sts/src/test/java/org/jclouds/sts/STSApiMetadataTest.java | 4 ----
 .../java/org/jclouds/sts/internal/BaseSTSApiExpectTest.java   | 4 ----
 .../java/org/jclouds/sts/internal/BaseSTSApiLiveTest.java     | 4 ----
 .../test/java/org/jclouds/sts/internal/BaseSTSExpectTest.java | 4 ----
 .../java/org/jclouds/sts/options/AssumeRoleOptionsTest.java   | 4 ----
 .../org/jclouds/sts/options/FederatedUserOptionsTest.java     | 4 ----
 .../jclouds/sts/options/SessionCredentialsOptionsTest.java    | 4 ----
 .../java/org/jclouds/sts/parse/AssumeRoleResponseTest.java    | 3 ---
 .../org/jclouds/sts/parse/GetFederationTokenResponseTest.java | 3 ---
 .../org/jclouds/sts/parse/GetSessionTokenResponseTest.java    | 3 ---
 .../org/jclouds/openstack/swift/CommonSwiftAsyncClient.java   | 1 -
 .../java/org/jclouds/openstack/swift/CommonSwiftClient.java   | 1 -
 .../java/org/jclouds/openstack/swift/CopyObjectException.java | 2 --
 .../src/main/java/org/jclouds/openstack/swift/Storage.java    | 2 --
 .../java/org/jclouds/openstack/swift/SwiftApiMetadata.java    | 2 --
 .../java/org/jclouds/openstack/swift/SwiftAsyncClient.java    | 1 -
 .../main/java/org/jclouds/openstack/swift/SwiftClient.java    | 1 -
 .../org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java | 2 --
 .../org/jclouds/openstack/swift/SwiftKeystoneAsyncClient.java | 1 -
 .../java/org/jclouds/openstack/swift/SwiftKeystoneClient.java | 1 -
 .../java/org/jclouds/openstack/swift/TemporaryUrlKey.java     | 1 -
 ...indIterableToHeadersWithContainerDeleteMetadataPrefix.java | 3 ---
 .../openstack/swift/blobstore/SwiftAsyncBlobStore.java        | 1 -
 .../jclouds/openstack/swift/blobstore/SwiftBlobSigner.java    | 3 ---
 .../org/jclouds/openstack/swift/blobstore/SwiftBlobStore.java | 4 ----
 .../swift/blobstore/config/SwiftBlobStoreContextModule.java   | 2 --
 .../swift/blobstore/config/TemporaryUrlExtensionModule.java   | 3 ---
 .../BlobStoreListContainerOptionsToListContainerOptions.java  | 3 ---
 .../openstack/swift/blobstore/functions/BlobToObject.java     | 3 ---
 .../swift/blobstore/functions/BlobToObjectGetOptions.java     | 3 ---
 .../swift/blobstore/functions/ContainerToResourceList.java    | 3 ---
 .../blobstore/functions/ContainerToResourceMetadata.java      | 3 ---
 .../openstack/swift/blobstore/functions/ObjectToBlob.java     | 3 ---
 .../swift/blobstore/functions/ObjectToBlobMetadata.java       | 3 ---
 .../swift/blobstore/functions/ResourceToObjectInfo.java       | 3 ---
 .../strategy/internal/MultipartUploadSlicingAlgorithm.java    | 1 -
 .../openstack/swift/config/SwiftKeystoneRestClientModule.java | 4 ----
 .../org/jclouds/openstack/swift/config/SwiftObjectModule.java | 2 --
 .../jclouds/openstack/swift/config/SwiftRestClientModule.java | 4 ----
 .../org/jclouds/openstack/swift/domain/AccountMetadata.java   | 5 -----
 .../org/jclouds/openstack/swift/domain/ContainerMetadata.java | 2 --
 .../openstack/swift/domain/MutableObjectInfoWithMetadata.java | 5 -----
 .../java/org/jclouds/openstack/swift/domain/ObjectInfo.java   | 5 -----
 .../java/org/jclouds/openstack/swift/domain/SwiftObject.java  | 4 ----
 .../internal/DelegatingMutableObjectInfoWithMetadata.java     | 5 -----
 .../domain/internal/MutableObjectInfoWithMetadataImpl.java    | 5 -----
 .../openstack/swift/domain/internal/SwiftObjectImpl.java      | 2 --
 .../swift/extensions/KeystoneTemporaryUrlKeyAsyncApi.java     | 1 -
 .../openstack/swift/extensions/TemporaryUrlKeyApi.java        | 1 -
 .../openstack/swift/extensions/TemporaryUrlKeyAsyncApi.java   | 1 -
 .../org/jclouds/openstack/swift/functions/ObjectName.java     | 4 ----
 .../functions/ParseAccountMetadataResponseFromHeaders.java    | 2 --
 .../swift/functions/ParseContainerMetadataFromHeaders.java    | 2 --
 .../swift/functions/ParseObjectFromHeadersAndHttpContent.java | 1 -
 .../openstack/swift/functions/ParseObjectInfoFromHeaders.java | 2 --
 .../swift/functions/ParseObjectInfoListFromJsonResponse.java  | 2 --
 .../swift/functions/ParseTemporaryUrlKeyFromHeaders.java      | 3 ---
 .../swift/handlers/ParseSwiftErrorFromHttpResponse.java       | 3 ---
 .../openstack/swift/options/CreateContainerOptions.java       | 2 --
 .../org/jclouds/openstack/swift/reference/SwiftConstants.java | 2 --
 .../org/jclouds/openstack/swift/reference/SwiftHeaders.java   | 4 ----
 .../java/org/jclouds/openstack/swift/utils/ETagUtils.java     | 3 ---
 .../jclouds/openstack/swift/CommonSwiftClientLiveTest.java    | 2 --
 .../org/jclouds/openstack/swift/CommonSwiftClientTest.java    | 2 --
 .../org/jclouds/openstack/swift/SwiftApiMetadataTest.java     | 4 ----
 .../org/jclouds/openstack/swift/SwiftClientExpectTest.java    | 4 ----
 .../java/org/jclouds/openstack/swift/SwiftClientLiveTest.java | 4 ----
 .../jclouds/openstack/swift/SwiftKeystoneApiMetadataTest.java | 4 ----
 .../jclouds/openstack/swift/SwiftKeystoneClientLiveTest.java  | 4 ----
 ...terableToHeadersWithContainerDeleteMetadataPrefixTest.java | 2 --
 .../BindMapToHeadersWithContainerMetadataPrefixTest.java      | 2 --
 .../swift/binders/BindSwiftObjectMetadataToRequestTest.java   | 2 --
 .../openstack/swift/blobstore/SwiftBlobSignerExpectTest.java  | 2 --
 .../swift/blobstore/SwiftKeystoneBlobSignerExpectTest.java    | 2 --
 .../ListContainerOptionsToBlobStoreListContainerOptions.java  | 3 ---
 .../swift/blobstore/functions/ResourceToObjectList.java       | 3 ---
 .../blobstore/integration/SwiftBlobIntegrationLiveTest.java   | 5 -----
 .../swift/blobstore/integration/SwiftBlobLiveTest.java        | 5 -----
 .../swift/blobstore/integration/SwiftBlobSignerLiveTest.java  | 3 ---
 .../integration/SwiftContainerIntegrationLiveTest.java        | 5 -----
 .../swift/blobstore/integration/SwiftContainerLiveTest.java   | 3 ---
 .../integration/SwiftServiceIntegrationLiveTest.java          | 3 ---
 .../internal/SequentialMultipartUploadStrategyMockTest.java   | 4 ----
 .../internal/ParseObjectInfoListFromJsonResponseTest.java     | 2 --
 .../functions/ParseContainerListFromJsonResponseTest.java     | 2 --
 .../functions/ParseContainerMetadataFromHeadersTest.java      | 2 --
 .../swift/functions/ParseObjectInfoFromHeadersTest.java       | 2 --
 .../swift/handlers/ParseSwiftErrorFromHttpResponseTest.java   | 4 ----
 .../jclouds/openstack/swift/internal/BaseSwiftExpectTest.java | 2 --
 .../openstack/swift/internal/BaseSwiftKeystoneExpectTest.java | 2 --
 .../openstack/swift/internal/StubSwiftAsyncClient.java        | 2 --
 ...essKeyAndSecretKeyAndTenantIdAuthenticationExpectTest.java | 1 -
 ...ecretKeyAndTenantNamePropertyAuthenticationExpectTest.java | 1 -
 .../AccessKeyAndSecretKeyAuthenticationExpectTest.java        | 1 -
 .../swift/keystone/PasswordAuthenticationExpectTest.java      | 1 -
 .../PasswordAuthenticationWithTenantNameExpectTest.java       | 1 -
 .../openstack/swift/options/CreateContainerOptionsTest.java   | 2 --
 .../openstack/swift/options/ListContainerOptionsTest.java     | 2 --
 .../java/org/jclouds/openstack/swift/utils/ETagUtilsTest.java | 3 ---
 .../java/org/jclouds/vcloud/TaskInErrorStateException.java    | 5 -----
 .../java/org/jclouds/vcloud/TaskStillRunningException.java    | 5 -----
 apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudApi.java   | 1 -
 .../src/main/java/org/jclouds/vcloud/VCloudApiMetadata.java   | 2 --
 .../main/java/org/jclouds/vcloud/VCloudResponseException.java | 3 ---
 apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudToken.java | 3 ---
 .../org/jclouds/vcloud/binders/BindCPUCountToXmlPayload.java  | 5 -----
 .../vcloud/binders/BindCaptureVAppParamsToXmlPayload.java     | 5 -----
 .../jclouds/vcloud/binders/BindCatalogItemToXmlPayload.java   | 5 -----
 .../jclouds/vcloud/binders/BindCloneParamsToXmlPayload.java   | 5 -----
 .../vcloud/binders/BindCloneVAppParamsToXmlPayload.java       | 5 -----
 .../binders/BindCloneVAppTemplateParamsToXmlPayload.java      | 5 -----
 .../vcloud/binders/BindDeployVAppParamsToXmlPayload.java      | 5 -----
 .../binders/BindGuestCustomizationSectionToXmlPayload.java    | 5 -----
 .../BindInstantiateVAppTemplateParamsToXmlPayload.java        | 5 -----
 .../org/jclouds/vcloud/binders/BindMemoryToXmlPayload.java    | 5 -----
 .../binders/BindNetworkConnectionSectionToXmlPayload.java     | 5 -----
 .../org/jclouds/vcloud/binders/BindParamsToXmlPayload.java    | 5 -----
 .../vcloud/binders/BindUndeployVAppParamsToXmlPayload.java    | 5 -----
 .../vcloud/binders/OrgNameAndCatalogNameToEndpoint.java       | 4 ----
 .../jclouds/vcloud/binders/OrgNameAndVDCNameToEndpoint.java   | 4 ----
 .../vcloud/binders/OrgNameCatalogNameItemNameToEndpoint.java  | 4 ----
 .../binders/OrgNameCatalogNameVAppTemplateNameToEndpoint.java | 4 ----
 .../vcloud/binders/OrgNameVDCNameNetworkNameToEndpoint.java   | 4 ----
 .../binders/OrgNameVDCNameResourceEntityNameToEndpoint.java   | 4 ----
 .../vcloud/binders/OrgNameVDCNameResourceNameToEndpoint.java  | 4 ----
 .../compute/config/VCloudComputeServiceContextModule.java     | 2 --
 .../config/VCloudComputeServiceDependenciesModule.java        | 4 ----
 .../vcloud/compute/functions/FindLocationForResource.java     | 3 ---
 .../org/jclouds/vcloud/compute/functions/HardwareForVApp.java | 3 ---
 .../vcloud/compute/functions/HardwareForVAppTemplate.java     | 3 ---
 .../vcloud/compute/functions/ImageForVAppTemplate.java        | 3 ---
 .../jclouds/vcloud/compute/functions/VAppToNodeMetadata.java  | 1 -
 .../VCloudHardwareBuilderFromResourceAllocations.java         | 3 ---
 ...plateAndReturnEnvelopeOrThrowIllegalArgumentException.java | 3 ---
 .../vcloud/compute/internal/VCloudTemplateBuilderImpl.java    | 4 ----
 .../jclouds/vcloud/compute/options/VCloudTemplateOptions.java | 2 --
 ...WithGroupEncodedIntoNameThenCustomizeDeployAndPowerOn.java | 3 ---
 .../strategy/NetworkConfigurationForNetworkAndOptions.java    | 4 ----
 .../vcloud/compute/strategy/VCloudComputeServiceAdapter.java  | 1 -
 .../org/jclouds/vcloud/compute/util/VCloudComputeUtils.java   | 4 ----
 .../java/org/jclouds/vcloud/config/DefaultCatalogForOrg.java  | 4 ----
 .../java/org/jclouds/vcloud/config/DefaultNetworkForVDC.java  | 4 ----
 .../java/org/jclouds/vcloud/config/DefaultOrgForUser.java     | 4 ----
 .../org/jclouds/vcloud/config/DefaultTasksListForOrg.java     | 4 ----
 .../jclouds/vcloud/config/DefaultVCloudReferencesModule.java  | 4 ----
 .../main/java/org/jclouds/vcloud/config/DefaultVDCForOrg.java | 4 ----
 .../java/org/jclouds/vcloud/config/VCloudHttpApiModule.java   | 2 --
 .../src/main/java/org/jclouds/vcloud/domain/Capacity.java     | 2 --
 .../src/main/java/org/jclouds/vcloud/domain/Catalog.java      | 3 ---
 .../src/main/java/org/jclouds/vcloud/domain/CatalogItem.java  | 3 ---
 .../java/org/jclouds/vcloud/domain/NetworkConnection.java     | 2 --
 apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Org.java  | 2 --
 .../main/java/org/jclouds/vcloud/domain/ReferenceType.java    | 3 ---
 .../src/main/java/org/jclouds/vcloud/domain/Status.java       | 2 --
 .../src/main/java/org/jclouds/vcloud/domain/TaskStatus.java   | 3 ---
 .../src/main/java/org/jclouds/vcloud/domain/TasksList.java    | 3 ---
 apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VApp.java | 2 --
 .../src/main/java/org/jclouds/vcloud/domain/VAppTemplate.java | 2 --
 .../src/main/java/org/jclouds/vcloud/domain/VCloudError.java  | 5 -----
 .../main/java/org/jclouds/vcloud/domain/VCloudSession.java    | 4 ----
 apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VDC.java  | 2 --
 apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Vm.java   | 2 --
 .../java/org/jclouds/vcloud/domain/internal/CatalogImpl.java  | 3 ---
 .../org/jclouds/vcloud/domain/internal/CatalogItemImpl.java   | 5 -----
 .../java/org/jclouds/vcloud/domain/internal/ErrorImpl.java    | 5 -----
 .../main/java/org/jclouds/vcloud/domain/internal/OrgImpl.java | 3 ---
 .../org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java | 3 ---
 .../java/org/jclouds/vcloud/domain/internal/TaskImpl.java     | 5 -----
 .../org/jclouds/vcloud/domain/internal/TasksListImpl.java     | 3 ---
 .../java/org/jclouds/vcloud/domain/internal/VAppImpl.java     | 3 ---
 .../org/jclouds/vcloud/domain/internal/VAppTemplateImpl.java  | 3 ---
 .../main/java/org/jclouds/vcloud/domain/internal/VDCImpl.java | 3 ---
 .../main/java/org/jclouds/vcloud/domain/internal/VmImpl.java  | 3 ---
 .../java/org/jclouds/vcloud/domain/network/FenceMode.java     | 2 --
 .../vcloud/domain/network/IpAddressAllocationMode.java        | 2 --
 .../main/java/org/jclouds/vcloud/domain/network/IpRange.java  | 1 -
 .../main/java/org/jclouds/vcloud/domain/network/IpScope.java  | 1 -
 .../java/org/jclouds/vcloud/domain/network/NetworkConfig.java | 4 ----
 .../java/org/jclouds/vcloud/domain/network/OrgNetwork.java    | 2 --
 .../vcloud/domain/network/firewall/FirewallPolicy.java        | 1 -
 .../vcloud/domain/network/firewall/FirewallProtocols.java     | 2 --
 .../jclouds/vcloud/domain/network/firewall/FirewallRule.java  | 1 -
 .../vcloud/domain/network/internal/OrgNetworkImpl.java        | 4 ----
 .../java/org/jclouds/vcloud/domain/network/nat/NatPolicy.java | 1 -
 .../org/jclouds/vcloud/domain/network/nat/NatProtocol.java    | 2 --
 .../java/org/jclouds/vcloud/domain/network/nat/NatRule.java   | 2 --
 .../java/org/jclouds/vcloud/domain/network/nat/NatType.java   | 2 --
 .../jclouds/vcloud/domain/network/nat/rules/MappingMode.java  | 1 -
 .../vcloud/domain/network/nat/rules/OneToOneVmRule.java       | 1 -
 .../vcloud/domain/network/nat/rules/PortForwardingRule.java   | 1 -
 .../org/jclouds/vcloud/domain/network/nat/rules/VmRule.java   | 1 -
 .../domain/ovf/EditableResourceAllocationSettingData.java     | 4 ----
 .../java/org/jclouds/vcloud/domain/ovf/VCloudHardDisk.java    | 4 ----
 .../org/jclouds/vcloud/domain/ovf/VCloudNetworkAdapter.java   | 4 ----
 .../src/main/java/org/jclouds/vcloud/endpoints/Catalog.java   | 3 ---
 .../src/main/java/org/jclouds/vcloud/endpoints/Network.java   | 3 ---
 .../src/main/java/org/jclouds/vcloud/endpoints/Org.java       | 3 ---
 .../src/main/java/org/jclouds/vcloud/endpoints/OrgList.java   | 3 ---
 .../src/main/java/org/jclouds/vcloud/endpoints/TasksList.java | 3 ---
 .../main/java/org/jclouds/vcloud/endpoints/VCloudLogin.java   | 2 --
 .../src/main/java/org/jclouds/vcloud/endpoints/VDC.java       | 3 ---
 .../src/main/java/org/jclouds/vcloud/features/CatalogApi.java | 1 -
 .../src/main/java/org/jclouds/vcloud/features/NetworkApi.java | 1 -
 .../src/main/java/org/jclouds/vcloud/features/OrgApi.java     | 2 --
 .../src/main/java/org/jclouds/vcloud/features/TaskApi.java    | 2 --
 .../src/main/java/org/jclouds/vcloud/features/VAppApi.java    | 1 -
 .../java/org/jclouds/vcloud/features/VAppTemplateApi.java     | 1 -
 .../src/main/java/org/jclouds/vcloud/features/VDCApi.java     | 2 --
 .../src/main/java/org/jclouds/vcloud/features/VmApi.java      | 2 --
 .../filters/AddVCloudAuthorizationAndCookieToRequest.java     | 3 ---
 .../org/jclouds/vcloud/functions/CatalogItemsInCatalog.java   | 3 ---
 .../java/org/jclouds/vcloud/functions/CatalogItemsInOrg.java  | 3 ---
 .../main/java/org/jclouds/vcloud/functions/CatalogsInOrg.java | 3 ---
 .../main/java/org/jclouds/vcloud/functions/NetworksInOrg.java | 3 ---
 .../java/org/jclouds/vcloud/functions/OrgNameToEndpoint.java  | 4 ----
 .../jclouds/vcloud/functions/OrgNameToTasksListEndpoint.java  | 4 ----
 .../java/org/jclouds/vcloud/functions/OrgsForLocations.java   | 3 ---
 .../main/java/org/jclouds/vcloud/functions/OrgsForNames.java  | 3 ---
 .../vcloud/functions/ParseLoginResponseFromHeaders.java       | 2 --
 .../vcloud/functions/VAppTemplatesForCatalogItems.java        | 3 ---
 .../java/org/jclouds/vcloud/functions/VAppTemplatesInOrg.java | 3 ---
 .../src/main/java/org/jclouds/vcloud/functions/VDCsInOrg.java | 3 ---
 .../vcloud/handlers/ParseVCloudErrorFromHttpResponse.java     | 3 ---
 .../jclouds/vcloud/location/OrgAndVDCToLocationSupplier.java  | 3 ---
 .../java/org/jclouds/vcloud/options/CaptureVAppOptions.java   | 5 -----
 .../java/org/jclouds/vcloud/options/CatalogItemOptions.java   | 5 -----
 .../main/java/org/jclouds/vcloud/options/CloneOptions.java    | 5 -----
 .../java/org/jclouds/vcloud/options/CloneVAppOptions.java     | 5 -----
 .../org/jclouds/vcloud/options/CloneVAppTemplateOptions.java  | 5 -----
 .../vcloud/options/InstantiateVAppTemplateOptions.java        | 5 -----
 .../main/java/org/jclouds/vcloud/predicates/TaskSuccess.java  | 2 --
 .../java/org/jclouds/vcloud/reference/VCloudConstants.java    | 2 --
 .../main/java/org/jclouds/vcloud/reference/package-info.java  | 1 -
 ...nceTypeFirstWithNameMatchingConfigurationKeyOrDefault.java | 4 ----
 .../org/jclouds/vcloud/suppliers/VAppTemplatesSupplier.java   | 3 ---
 apis/vcloud/src/main/java/org/jclouds/vcloud/util/Utils.java  | 4 ----
 .../src/main/java/org/jclouds/vcloud/util/VCloudUtils.java    | 2 --
 .../src/main/java/org/jclouds/vcloud/xml/CatalogHandler.java  | 3 ---
 .../main/java/org/jclouds/vcloud/xml/CatalogItemHandler.java  | 3 ---
 .../src/main/java/org/jclouds/vcloud/xml/ErrorHandler.java    | 3 ---
 .../jclouds/vcloud/xml/GuestCustomizationSectionHandler.java  | 3 ---
 .../java/org/jclouds/vcloud/xml/NetworkConnectionHandler.java | 3 ---
 .../jclouds/vcloud/xml/NetworkConnectionSectionHandler.java   | 3 ---
 .../src/main/java/org/jclouds/vcloud/xml/OrgHandler.java      | 3 ---
 .../src/main/java/org/jclouds/vcloud/xml/OrgListHandler.java  | 3 ---
 .../main/java/org/jclouds/vcloud/xml/OrgNetworkHandler.java   | 3 ---
 .../java/org/jclouds/vcloud/xml/SupportedVersionsHandler.java | 3 ---
 .../src/main/java/org/jclouds/vcloud/xml/TaskHandler.java     | 3 ---
 .../main/java/org/jclouds/vcloud/xml/TasksListHandler.java    | 3 ---
 .../src/main/java/org/jclouds/vcloud/xml/VAppHandler.java     | 3 ---
 .../main/java/org/jclouds/vcloud/xml/VAppTemplateHandler.java | 3 ---
 .../org/jclouds/vcloud/xml/VCloudVirtualHardwareHandler.java  | 3 ---
 .../src/main/java/org/jclouds/vcloud/xml/VDCHandler.java      | 3 ---
 .../src/main/java/org/jclouds/vcloud/xml/VmHandler.java       | 3 ---
 .../jclouds/vcloud/xml/ovf/VCloudNetworkSectionHandler.java   | 3 ---
 .../jclouds/vcloud/xml/ovf/VCloudOperatingSystemHandler.java  | 3 ---
 .../xml/ovf/VCloudResourceAllocationSettingDataHandler.java   | 3 ---
 .../test/java/org/jclouds/vcloud/VCloudApiMetadataTest.java   | 4 ----
 .../src/test/java/org/jclouds/vcloud/VCloudApiTest.java       | 2 --
 .../java/org/jclouds/vcloud/VCloudSessionRefreshLiveTest.java | 2 --
 .../test/java/org/jclouds/vcloud/VCloudVersionsApiTest.java   | 2 --
 .../vcloud/binders/BindCatalogItemToXmlPayloadTest.java       | 2 --
 .../vcloud/binders/BindCloneVAppParamsToXmlPayloadTest.java   | 2 --
 .../binders/BindCloneVAppTemplateParamsToXmlPayloadTest.java  | 2 --
 .../vcloud/binders/BindDeployVAppParamsToXmlPayloadTest.java  | 2 --
 .../BindInstantiateVAppTemplateParamsToXmlPayloadTest.java    | 2 --
 .../binders/BindNetworkConnectionSectionToXmlPayloadTest.java | 2 --
 .../binders/BindUndeployVAppParamsToXmlPayloadTest.java       | 2 --
 .../vcloud/compute/BaseVCloudComputeServiceExpectTest.java    | 2 --
 .../jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java  | 5 -----
 .../vcloud/compute/functions/FindLocationForResourceTest.java | 2 --
 .../compute/functions/ListImagesInVCloudExpectTest.java       | 4 ----
 .../vcloud/compute/functions/VAppToNodeMetadataTest.java      | 2 --
 .../vcloud/compute/options/VCloudTemplateOptionsTest.java     | 2 --
 ...ncodedIntoNameThenCustomizeDeployAndPowerOnExpectTest.java | 4 ----
 .../java/org/jclouds/vcloud/features/CatalogApiLiveTest.java  | 3 ---
 .../test/java/org/jclouds/vcloud/features/CatalogApiTest.java | 2 --
 .../java/org/jclouds/vcloud/features/NetworkApiLiveTest.java  | 3 ---
 .../test/java/org/jclouds/vcloud/features/NetworkApiTest.java | 2 --
 .../test/java/org/jclouds/vcloud/features/OrgApiLiveTest.java | 3 ---
 .../src/test/java/org/jclouds/vcloud/features/OrgApiTest.java | 2 --
 .../java/org/jclouds/vcloud/features/TaskApiLiveTest.java     | 3 ---
 .../test/java/org/jclouds/vcloud/features/TaskApiTest.java    | 2 --
 .../java/org/jclouds/vcloud/features/VAppApiLiveTest.java     | 4 ----
 .../test/java/org/jclouds/vcloud/features/VAppApiTest.java    | 2 --
 .../org/jclouds/vcloud/features/VAppTemplateApiLiveTest.java  | 4 ----
 .../java/org/jclouds/vcloud/features/VAppTemplateApiTest.java | 2 --
 .../test/java/org/jclouds/vcloud/features/VDCApiLiveTest.java | 3 ---
 .../src/test/java/org/jclouds/vcloud/features/VDCApiTest.java | 2 --
 .../test/java/org/jclouds/vcloud/features/VmApiLiveTest.java  | 2 --
 .../src/test/java/org/jclouds/vcloud/features/VmApiTest.java  | 2 --
 .../filters/AddVCloudAuthorizationAndCookieToRequestTest.java | 3 ---
 .../vcloud/functions/ParseLoginResponseFromHeadersTest.java   | 2 --
 .../vcloud/handlers/ParseVCloudErrorFromHttpResponseTest.java | 4 ----
 .../org/jclouds/vcloud/internal/BaseVCloudApiLiveTest.java    | 4 ----
 .../java/org/jclouds/vcloud/internal/BaseVCloudApiTest.java   | 2 --
 .../java/org/jclouds/vcloud/internal/VCloudLoginApiTest.java  | 2 --
 .../vcloud/options/InstantiateVAppTemplateOptionsTest.java    | 2 --
 ...ypeFirstWithNameMatchingConfigurationKeyOrDefaultTest.java | 2 --
 .../src/test/java/org/jclouds/vcloud/utils/TestUtils.java     | 2 --
 .../test/java/org/jclouds/vcloud/xml/CatalogHandlerTest.java  | 2 --
 .../java/org/jclouds/vcloud/xml/CatalogItemHandlerTest.java   | 2 --
 .../vcloud/xml/GuestCustomizationSectionHandlerTest.java      | 2 --
 .../org/jclouds/vcloud/xml/NetworkConnectionHandlerTest.java  | 2 --
 .../vcloud/xml/NetworkConnectionSectionHandlerTest.java       | 2 --
 .../src/test/java/org/jclouds/vcloud/xml/OrgHandlerTest.java  | 2 --
 .../test/java/org/jclouds/vcloud/xml/OrgListHandlerTest.java  | 2 --
 .../java/org/jclouds/vcloud/xml/OrgNetworkHandlerTest.java    | 2 --
 .../org/jclouds/vcloud/xml/SupportedVersionsHandlerTest.java  | 2 --
 .../src/test/java/org/jclouds/vcloud/xml/TaskHandlerTest.java | 2 --
 .../java/org/jclouds/vcloud/xml/TasksListHandlerTest.java     | 2 --
 .../src/test/java/org/jclouds/vcloud/xml/VAppHandlerTest.java | 2 --
 .../java/org/jclouds/vcloud/xml/VAppTemplateHandlerTest.java  | 2 --
 .../src/test/java/org/jclouds/vcloud/xml/VDCHandlerTest.java  | 2 --
 .../src/test/java/org/jclouds/vcloud/xml/VmHandlerTest.java   | 2 --
 .../xml/ovf/VCloudOperatingSystemSectionHandlerTest.java      | 2 --
 .../xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java      | 2 --
 .../main/java/org/jclouds/blobstore/BlobRequestSigner.java    | 2 --
 blobstore/src/main/java/org/jclouds/blobstore/BlobStore.java  | 1 -
 .../src/main/java/org/jclouds/blobstore/BlobStoreContext.java | 3 ---
 blobstore/src/main/java/org/jclouds/blobstore/BlobStores.java | 1 -
 .../org/jclouds/blobstore/ContainerNotFoundException.java     | 2 --
 .../java/org/jclouds/blobstore/KeyAlreadyExistsException.java | 2 --
 .../main/java/org/jclouds/blobstore/KeyNotFoundException.java | 2 --
 .../main/java/org/jclouds/blobstore/LocalAsyncBlobStore.java  | 4 ----
 .../java/org/jclouds/blobstore/LocalBlobRequestSigner.java    | 3 ---
 .../main/java/org/jclouds/blobstore/LocalStorageStrategy.java | 2 --
 .../main/java/org/jclouds/blobstore/TransientApiMetadata.java | 2 --
 .../java/org/jclouds/blobstore/attr/BlobCapabilities.java     | 3 ---
 .../main/java/org/jclouds/blobstore/attr/BlobCapability.java  | 3 ---
 .../src/main/java/org/jclouds/blobstore/attr/BlobScope.java   | 3 ---
 .../src/main/java/org/jclouds/blobstore/attr/BlobScopes.java  | 3 ---
 .../src/main/java/org/jclouds/blobstore/attr/Charge.java      | 3 ---
 .../src/main/java/org/jclouds/blobstore/attr/Charges.java     | 3 ---
 .../java/org/jclouds/blobstore/attr/ConsistencyModel.java     | 3 ---
 .../org/jclouds/blobstore/attr/ContainerCapabilities.java     | 3 ---
 .../java/org/jclouds/blobstore/attr/ContainerCapability.java  | 3 ---
 .../org/jclouds/blobstore/attr/ContainerVisibilities.java     | 3 ---
 .../java/org/jclouds/blobstore/attr/ContainerVisibility.java  | 3 ---
 .../java/org/jclouds/blobstore/attr/FolderCapability.java     | 3 ---
 .../jclouds/blobstore/binders/BindBlobToMultipartForm.java    | 4 ----
 .../jclouds/blobstore/binders/BindMapToHeadersWithPrefix.java | 4 ----
 .../binders/BindUserMetadataToHeadersWithPrefix.java          | 4 ----
 .../org/jclouds/blobstore/config/BlobStoreObjectModule.java   | 2 --
 .../blobstore/config/TransientBlobStoreContextModule.java     | 2 --
 .../src/main/java/org/jclouds/blobstore/domain/Blob.java      | 2 --
 .../main/java/org/jclouds/blobstore/domain/BlobBuilder.java   | 2 --
 .../main/java/org/jclouds/blobstore/domain/BlobMetadata.java  | 2 --
 .../org/jclouds/blobstore/domain/MutableBlobMetadata.java     | 2 --
 .../org/jclouds/blobstore/domain/MutableStorageMetadata.java  | 2 --
 .../src/main/java/org/jclouds/blobstore/domain/PageSet.java   | 5 -----
 .../java/org/jclouds/blobstore/domain/StorageMetadata.java    | 2 --
 .../jclouds/blobstore/domain/internal/BlobBuilderImpl.java    | 3 ---
 .../java/org/jclouds/blobstore/domain/internal/BlobImpl.java  | 2 --
 .../jclouds/blobstore/domain/internal/BlobMetadataImpl.java   | 2 --
 .../blobstore/domain/internal/MutableBlobMetadataImpl.java    | 2 --
 .../blobstore/domain/internal/MutableStorageMetadataImpl.java | 2 --
 .../blobstore/domain/internal/StorageMetadataImpl.java        | 2 --
 .../main/java/org/jclouds/blobstore/functions/BlobName.java   | 4 ----
 .../org/jclouds/blobstore/functions/BlobToHttpGetOptions.java | 3 ---
 .../blobstore/functions/HttpGetOptionsListToGetOptions.java   | 4 ----
 .../functions/ParseBlobFromHeadersAndHttpContent.java         | 1 -
 .../functions/ParseSystemAndUserMetadataFromHeaders.java      | 3 ---
 .../jclouds/blobstore/functions/PrefixToResourceMetadata.java | 3 ---
 .../ResourceMetadataToRelativePathResourceMetadata.java       | 3 ---
 .../org/jclouds/blobstore/internal/BaseAsyncBlobStore.java    | 1 -
 .../java/org/jclouds/blobstore/internal/BaseBlobStore.java    | 4 ----
 .../org/jclouds/blobstore/internal/BlobStoreContextImpl.java  | 3 ---
 .../jclouds/blobstore/internal/RequestSigningUnsupported.java | 4 ----
 .../org/jclouds/blobstore/options/CreateContainerOptions.java | 2 --
 .../main/java/org/jclouds/blobstore/options/GetOptions.java   | 3 ---
 .../java/org/jclouds/blobstore/options/ListAllOptions.java    | 1 -
 .../org/jclouds/blobstore/options/ListContainerOptions.java   | 2 --
 .../main/java/org/jclouds/blobstore/options/ListOptions.java  | 2 --
 .../main/java/org/jclouds/blobstore/options/PutOptions.java   | 2 --
 .../org/jclouds/blobstore/reference/BlobStoreConstants.java   | 2 --
 .../java/org/jclouds/blobstore/reference/package-info.java    | 1 -
 .../jclouds/blobstore/strategy/ClearContainerStrategy.java    | 2 --
 .../org/jclouds/blobstore/strategy/ClearListStrategy.java     | 2 --
 .../org/jclouds/blobstore/strategy/CountListStrategy.java     | 2 --
 .../jclouds/blobstore/strategy/DeleteDirectoryStrategy.java   | 2 --
 .../jclouds/blobstore/strategy/GetBlobsInListStrategy.java    | 2 --
 .../org/jclouds/blobstore/strategy/GetDirectoryStrategy.java  | 2 --
 .../blobstore/strategy/IfDirectoryReturnNameStrategy.java     | 2 --
 .../org/jclouds/blobstore/strategy/ListBlobsInContainer.java  | 2 --
 .../org/jclouds/blobstore/strategy/ListContainerStrategy.java | 2 --
 .../java/org/jclouds/blobstore/strategy/MkdirStrategy.java    | 2 --
 .../java/org/jclouds/blobstore/strategy/PutBlobsStrategy.java | 2 --
 .../strategy/internal/ConcatenateContainerLists.java          | 2 --
 .../blobstore/strategy/internal/CountBlobTypeInList.java      | 2 --
 .../blobstore/strategy/internal/DeleteAllKeysInList.java      | 3 ---
 .../blobstore/strategy/internal/FetchBlobMetadata.java        | 2 --
 .../strategy/internal/GetAllBlobsInListAndRetryOnFailure.java | 2 --
 .../internal/ListContainerAndRecurseThroughFolders.java       | 2 --
 .../blobstore/strategy/internal/MarkerFileMkdirStrategy.java  | 2 --
 .../strategy/internal/MarkersDeleteDirectoryStrategy.java     | 1 -
 .../strategy/internal/MarkersGetDirectoryStrategy.java        | 1 -
 .../internal/MarkersIfDirectoryReturnNameStrategy.java        | 4 ----
 .../blobstore/strategy/internal/PutBlobsStrategyImpl.java     | 4 ----
 .../main/java/org/jclouds/blobstore/util/BlobStoreUtils.java  | 4 ----
 .../src/main/java/org/jclouds/blobstore/util/BlobUtils.java   | 4 ----
 .../org/jclouds/blobstore/util/internal/BlobUtilsImpl.java    | 2 --
 .../org/jclouds/blobstore/BlobStoreContextFactoryTest.java    | 2 --
 .../java/org/jclouds/blobstore/TransientApiMetadataTest.java  | 4 ----
 .../org/jclouds/blobstore/TransientBlobRequestSignerTest.java | 2 --
 .../blobstore/binders/BindBlobToMultipartFormTest.java        | 2 --
 .../blobstore/binders/BindMapToHeadersWithPrefixTest.java     | 4 ----
 .../binders/BindUserMetadataToHeadersWithPrefixTest.java      | 4 ----
 .../java/org/jclouds/blobstore/functions/BlobNameTest.java    | 4 ----
 .../jclouds/blobstore/functions/BlobToHttpGetOptionsTest.java | 4 ----
 .../functions/ParseBlobFromHeadersAndHttpContentTest.java     | 3 ---
 .../functions/ParseSystemAndUserMetadataFromHeadersTest.java  | 3 ---
 .../blobstore/functions/PrefixToResourceMetadataTest.java     | 4 ----
 .../ResourceMetadataToRelativePathResourceMetadataTest.java   | 4 ----
 .../blobstore/integration/TransientBlobIntegrationTest.java   | 5 -----
 .../integration/TransientContainerIntegrationTest.java        | 4 ----
 .../integration/TransientServiceIntegrationTest.java          | 3 ---
 .../integration/internal/BaseBlobIntegrationTest.java         | 3 ---
 .../blobstore/integration/internal/BaseBlobLiveTest.java      | 2 --
 .../integration/internal/BaseBlobSignerLiveTest.java          | 2 --
 .../integration/internal/BaseContainerIntegrationTest.java    | 3 ---
 .../blobstore/integration/internal/BaseContainerLiveTest.java | 4 ----
 .../integration/internal/BaseServiceIntegrationTest.java      | 4 ----
 .../jclouds/blobstore/internal/BaseBlobSignerExpectTest.java  | 3 ---
 .../blobstore/internal/BaseBlobStoreApiMetadataTest.java      | 4 ----
 .../java/org/jclouds/blobstore/options/GetOptionsTest.java    | 2 --
 .../java/org/jclouds/blobstore/options/ListOptionsTest.java   | 2 --
 .../blobstore/strategy/internal/BiggerThanPageSizeTest.java   | 4 ----
 .../strategy/internal/ConcatenateContainerListsTest.java      | 4 ----
 .../blobstore/strategy/internal/DeleteAllKeysInListTest.java  | 4 ----
 .../java/org/jclouds/blobstore/util/BlobStoreUtilsTest.java   | 2 --
 .../jclouds/azure/storage/AzureStorageResponseException.java  | 2 --
 .../azure/storage/config/AzureStorageParserModule.java        | 5 -----
 .../azure/storage/config/AzureStorageRestClientModule.java    | 2 --
 .../org/jclouds/azure/storage/domain/AzureStorageError.java   | 2 --
 .../java/org/jclouds/azure/storage/domain/BoundedSet.java     | 5 -----
 .../jclouds/azure/storage/domain/internal/BoundedHashSet.java | 5 -----
 .../azure/storage/filters/SharedKeyLiteAuthentication.java    | 2 --
 .../storage/handlers/AzureStorageClientErrorRetryHandler.java | 2 --
 .../handlers/ParseAzureStorageErrorFromXmlContent.java        | 2 --
 .../java/org/jclouds/azure/storage/options/CreateOptions.java | 1 -
 .../java/org/jclouds/azure/storage/options/ListOptions.java   | 1 -
 .../jclouds/azure/storage/reference/AzureStorageHeaders.java  | 2 --
 .../org/jclouds/azure/storage/util/AzureStorageUtils.java     | 2 --
 .../main/java/org/jclouds/azure/storage/xml/ErrorHandler.java | 1 -
 .../storage/filters/SharedKeyLiteAuthenticationTest.java      | 4 ----
 .../storage/handlers/ParseAzureErrorFromXmlContentTest.java   | 4 ----
 .../org/jclouds/azure/storage/options/CreateOptionsTest.java  | 2 --
 .../org/jclouds/azure/storage/options/ListOptionsTest.java    | 2 --
 .../java/org/jclouds/azure/storage/xml/ErrorHandlerTest.java  | 2 --
 .../openstack/config/OpenStackAuthenticationModule.java       | 2 --
 .../src/main/java/org/jclouds/openstack/domain/Link.java      | 1 -
 .../src/main/java/org/jclouds/openstack/domain/Resource.java  | 1 -
 .../java/org/jclouds/openstack/filters/AddTimestampQuery.java | 3 ---
 .../org/jclouds/openstack/filters/AuthenticateRequest.java    | 3 ---
 .../functions/ParseAuthenticationResponseFromHeaders.java     | 2 --
 .../java/org/jclouds/openstack/handlers/RetryOnRenew.java     | 3 ---
 .../java/org/jclouds/openstack/internal/Authentication.java   | 2 --
 .../jclouds/openstack/internal/OpenStackAuthAsyncClient.java  | 1 -
 .../org/jclouds/openstack/internal/OpenStackAuthClient.java   | 1 -
 .../openstack/keystone/v1_1/AuthenticationAsyncClient.java    | 1 -
 .../jclouds/openstack/keystone/v1_1/AuthenticationClient.java | 1 -
 .../keystone/v1_1/binders/BindCredentialsToJsonPayload.java   | 5 -----
 .../keystone/v1_1/config/AuthenticationServiceModule.java     | 4 ----
 .../java/org/jclouds/openstack/keystone/v1_1/domain/Auth.java | 1 -
 .../org/jclouds/openstack/keystone/v1_1/domain/Endpoint.java  | 1 -
 .../org/jclouds/openstack/keystone/v1_1/domain/Token.java     | 1 -
 .../openstack/keystone/v1_1/handlers/RetryOnRenew.java        | 3 ---
 .../java/org/jclouds/openstack/options/BaseListOptions.java   | 1 -
 .../java/org/jclouds/openstack/predicates/LinkPredicates.java | 2 --
 .../java/org/jclouds/openstack/reference/AuthHeaders.java     | 2 --
 .../java/org/jclouds/openstack/reference/package-info.java    | 1 -
 .../src/main/java/org/jclouds/openstack/services/Compute.java | 1 -
 .../main/java/org/jclouds/openstack/services/Extension.java   | 1 -
 .../src/main/java/org/jclouds/openstack/services/Image.java   | 1 -
 .../main/java/org/jclouds/openstack/services/ObjectStore.java | 1 -
 .../main/java/org/jclouds/openstack/services/ServiceType.java | 1 -
 .../org/jclouds/openstack/filters/AddTimestampQueryTest.java  | 4 ----
 .../functions/ParseAuthenticationResponseFromHeadersTest.java | 2 --
 .../java/org/jclouds/openstack/handlers/RetryOnRenewTest.java | 2 --
 .../openstack/internal/OpenStackAuthAsyncClientTest.java      | 2 --
 .../openstack/internal/TestOpenStackAuthenticationModule.java | 4 ----
 .../v1_1/functions/PublicURLOrInternalIfNullTest.java         | 3 ---
 .../functions/RegionFirstPartOfDNSNameOrProviderTest.java     | 3 ---
 .../openstack/keystone/v1_1/handlers/RetryOnRenewTest.java    | 2 --
 .../v1_1/internal/BaseKeystoneRestClientExpectTest.java       | 2 --
 .../jclouds/openstack/keystone/v1_1/parse/ParseAuthTest.java  | 3 ---
 .../RegionIdToURIFromAuthForServiceSupplierTest.java          | 3 ---
 .../v1_1/suppliers/V1DefaultRegionIdSupplierTest.java         | 3 ---
 .../org/jclouds/openstack/options/BaseListOptionsTest.java    | 2 --
 .../org/jclouds/openstack/predicates/LinkPredicatesTest.java  | 4 ----
 compute/src/main/java/org/jclouds/cim/CIMPredicates.java      | 4 ----
 compute/src/main/java/org/jclouds/cim/ManagedElement.java     | 2 --
 compute/src/main/java/org/jclouds/cim/OSType.java             | 1 -
 .../java/org/jclouds/cim/ResourceAllocationSettingData.java   | 2 --
 compute/src/main/java/org/jclouds/cim/SettingData.java        | 2 --
 .../main/java/org/jclouds/cim/VirtualSystemSettingData.java   | 2 --
 .../cim/functions/HardwareBuilderFromResourceAllocations.java | 3 ---
 .../jclouds/cim/xml/ResourceAllocationSettingDataHandler.java | 3 ---
 .../org/jclouds/cim/xml/VirtualSystemSettingDataHandler.java  | 3 ---
 compute/src/main/java/org/jclouds/compute/ComputeService.java | 3 ---
 .../main/java/org/jclouds/compute/ComputeServiceAdapter.java  | 3 ---
 .../main/java/org/jclouds/compute/ComputeServiceContext.java  | 4 ----
 .../jclouds/compute/JCloudsNativeComputeServiceAdapter.java   | 3 ---
 .../src/main/java/org/jclouds/compute/RunNodesException.java  | 4 ----
 .../java/org/jclouds/compute/RunScriptOnNodesException.java   | 4 ----
 compute/src/main/java/org/jclouds/compute/Utils.java          | 4 ----
 .../BlockUntilInitScriptStatusIsZeroThenReturnOutput.java     | 2 --
 .../compute/callables/InitScriptConfigurationForTasks.java    | 4 ----
 .../java/org/jclouds/compute/callables/RunScriptOnNode.java   | 2 --
 .../callables/RunScriptOnNodeAsInitScriptUsingSsh.java        | 4 ----
 ...ScriptOnNodeAsInitScriptUsingSshAndBlockUntilComplete.java | 4 ----
 .../jclouds/compute/callables/RunScriptOnNodeUsingSsh.java    | 4 ----
 .../compute/callables/ScriptStillRunningException.java        | 4 ----
 .../org/jclouds/compute/callables/SudoAwareInitManager.java   | 4 ----
 .../org/jclouds/compute/config/AdminAccessConfiguration.java  | 5 -----
 .../compute/config/BaseComputeServiceContextModule.java       | 4 ----
 .../jclouds/compute/config/BindComputeStrategiesByClass.java  | 5 -----
 .../jclouds/compute/config/BindComputeSuppliersByClass.java   | 3 ---
 .../compute/config/ComputeServiceAdapterContextModule.java    | 4 ----
 .../org/jclouds/compute/config/ComputeServiceProperties.java  | 4 ----
 .../jclouds/compute/config/ComputeServiceTimeoutsModule.java  | 6 ------
 .../org/jclouds/compute/config/CustomizationResponse.java     | 2 --
 ...ProviderFromPropertiesAndStoreCredentialsOrReturnNull.java | 3 ---
 .../JCloudsNativeComputeServiceAdapterContextModule.java      | 4 ----
 .../jclouds/compute/config/PersistNodeCredentialsModule.java  | 4 ----
 .../main/java/org/jclouds/compute/config/ResolvesImages.java  | 2 --
 .../java/org/jclouds/compute/domain/CIMOperatingSystem.java   | 1 -
 .../java/org/jclouds/compute/domain/CloneImageTemplate.java   | 2 --
 .../main/java/org/jclouds/compute/domain/ComputeMetadata.java | 2 --
 .../org/jclouds/compute/domain/ComputeMetadataBuilder.java    | 4 ----
 .../compute/domain/ComputeMetadataIncludingStatus.java        | 1 -
 .../src/main/java/org/jclouds/compute/domain/ComputeType.java | 4 ----
 .../src/main/java/org/jclouds/compute/domain/ExecChannel.java | 2 --
 .../main/java/org/jclouds/compute/domain/ExecResponse.java    | 3 ---
 .../src/main/java/org/jclouds/compute/domain/Hardware.java    | 2 --
 .../main/java/org/jclouds/compute/domain/HardwareBuilder.java | 4 ----
 compute/src/main/java/org/jclouds/compute/domain/Image.java   | 2 --
 .../main/java/org/jclouds/compute/domain/ImageBuilder.java    | 3 ---
 .../main/java/org/jclouds/compute/domain/ImageTemplate.java   | 3 ---
 .../java/org/jclouds/compute/domain/ImageTemplateBuilder.java | 3 ---
 .../src/main/java/org/jclouds/compute/domain/LoginType.java   | 2 --
 .../main/java/org/jclouds/compute/domain/NodeMetadata.java    | 4 ----
 .../java/org/jclouds/compute/domain/NodeMetadataBuilder.java  | 3 ---
 .../main/java/org/jclouds/compute/domain/OperatingSystem.java | 2 --
 .../src/main/java/org/jclouds/compute/domain/OsFamily.java    | 3 ---
 .../java/org/jclouds/compute/domain/OsFamilyVersion64Bit.java | 5 -----
 .../src/main/java/org/jclouds/compute/domain/Processor.java   | 2 --
 .../main/java/org/jclouds/compute/domain/SecurityGroup.java   | 2 --
 .../java/org/jclouds/compute/domain/SecurityGroupBuilder.java | 3 ---
 .../src/main/java/org/jclouds/compute/domain/Template.java    | 2 --
 .../main/java/org/jclouds/compute/domain/TemplateBuilder.java | 2 --
 .../java/org/jclouds/compute/domain/TemplateBuilderSpec.java  | 1 -
 compute/src/main/java/org/jclouds/compute/domain/Volume.java  | 2 --
 .../main/java/org/jclouds/compute/domain/VolumeBuilder.java   | 4 ----
 .../jclouds/compute/domain/internal/ComputeMetadataImpl.java  | 4 ----
 .../org/jclouds/compute/domain/internal/HardwareImpl.java     | 3 ---
 .../java/org/jclouds/compute/domain/internal/ImageImpl.java   | 3 ---
 .../org/jclouds/compute/domain/internal/NodeMetadataImpl.java | 4 ----
 .../jclouds/compute/domain/internal/TemplateBuilderImpl.java  | 4 ----
 .../org/jclouds/compute/domain/internal/TemplateImpl.java     | 4 ----
 .../java/org/jclouds/compute/domain/internal/VolumeImpl.java  | 3 ---
 .../jclouds/compute/events/InitScriptOnNodeSubmission.java    | 2 --
 .../main/java/org/jclouds/compute/events/StatementOnNode.java | 1 -
 .../org/jclouds/compute/events/StatementOnNodeCompletion.java | 2 --
 .../org/jclouds/compute/events/StatementOnNodeFailure.java    | 2 --
 .../org/jclouds/compute/events/StatementOnNodeSubmission.java | 2 --
 .../java/org/jclouds/compute/extensions/ImageExtension.java   | 2 --
 .../jclouds/compute/extensions/SecurityGroupExtension.java    | 2 --
 .../functions/CreateSshClientOncePortIsListeningOnNode.java   | 5 -----
 .../DefaultCredentialsFromImageOrOverridingCredentials.java   | 4 ----
 .../org/jclouds/compute/functions/GroupNamingConvention.java  | 2 --
 .../java/org/jclouds/compute/functions/PollNodeRunning.java   | 3 ---
 .../jclouds/compute/functions/TemplateOptionsToStatement.java | 4 ----
 .../java/org/jclouds/compute/internal/BaseComputeService.java | 4 ----
 .../jclouds/compute/internal/ComputeServiceContextImpl.java   | 3 ---
 ...matSharedNamesAndAppendUniqueStringToThoseWhichRepeat.java | 1 -
 .../src/main/java/org/jclouds/compute/internal/UtilsImpl.java | 4 ----
 .../java/org/jclouds/compute/options/RunScriptOptions.java    | 2 --
 .../java/org/jclouds/compute/options/TemplateOptions.java     | 2 --
 .../org/jclouds/compute/predicates/AtomicImageAvailable.java  | 2 --
 .../org/jclouds/compute/predicates/AtomicImageDeleted.java    | 5 -----
 .../org/jclouds/compute/predicates/AtomicNodeRunning.java     | 2 --
 .../org/jclouds/compute/predicates/AtomicNodeSuspended.java   | 2 --
 .../org/jclouds/compute/predicates/AtomicNodeTerminated.java  | 5 -----
 .../org/jclouds/compute/predicates/HardwarePredicates.java    | 2 --
 .../java/org/jclouds/compute/predicates/ImagePredicates.java  | 2 --
 .../java/org/jclouds/compute/predicates/NodePredicates.java   | 2 --
 .../jclouds/compute/predicates/OperatingSystemPredicates.java | 2 --
 .../jclouds/compute/predicates/ScriptStatusReturnsZero.java   | 2 --
 .../RefreshAndDoubleCheckOnFailUnlessStatusInvalid.java       | 2 --
 .../RefreshImageAndDoubleCheckOnFailUnlessStatusInvalid.java  | 2 --
 .../RefreshNodeAndDoubleCheckOnFailUnlessStatusInvalid.java   | 2 --
 .../TrueIfNullOrDeletedRefreshAndDoubleCheckOnFalse.java      | 5 -----
 .../jclouds/compute/reference/ComputeServiceConstants.java    | 4 ----
 .../compute/strategy/CreateNodeWithGroupEncodedIntoName.java  | 2 --
 .../compute/strategy/CreateNodesInGroupThenAddToSet.java      | 4 ----
 .../CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java | 4 ----
 .../org/jclouds/compute/strategy/DestroyNodeStrategy.java     | 2 --
 .../java/org/jclouds/compute/strategy/GetImageStrategy.java   | 2 --
 .../org/jclouds/compute/strategy/GetNodeMetadataStrategy.java | 2 --
 .../strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java    | 4 ----
 .../java/org/jclouds/compute/strategy/ListNodesStrategy.java  | 4 ----
 .../PopulateDefaultLoginCredentialsForImageStrategy.java      | 3 ---
 .../compute/strategy/PrioritizeCredentialsFromTemplate.java   | 4 ----
 .../java/org/jclouds/compute/strategy/RebootNodeStrategy.java | 2 --
 .../java/org/jclouds/compute/strategy/ResumeNodeStrategy.java | 2 --
 ...unScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java | 4 ----
 .../org/jclouds/compute/strategy/SuspendNodeStrategy.java     | 2 --
 .../strategy/impl/AdaptingComputeServiceStrategies.java       | 4 ----
 .../impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java | 2 --
 .../compute/strategy/impl/ReturnCredentialsBoundToImage.java  | 3 ---
 .../main/java/org/jclouds/compute/stub/StubApiMetadata.java   | 2 --
 .../compute/stub/config/StubComputeServiceAdapter.java        | 4 ----
 .../compute/stub/config/StubComputeServiceContextModule.java  | 4 ----
 .../stub/config/StubComputeServiceDependenciesModule.java     | 4 ----
 .../compute/stub/extensions/StubSecurityGroupExtension.java   | 2 --
 .../java/org/jclouds/compute/util/ComputeServiceUtils.java    | 4 ----
 .../src/main/java/org/jclouds/compute/util/ComputeUtils.java  | 4 ----
 .../main/java/org/jclouds/compute/util/OpenSocketFinder.java  | 2 --
 .../src/main/java/org/jclouds/net/domain/IpPermission.java    | 1 -
 compute/src/main/java/org/jclouds/net/domain/IpProtocol.java  | 4 ----
 compute/src/main/java/org/jclouds/net/util/IpPermissions.java | 2 --
 compute/src/main/java/org/jclouds/ovf/Configuration.java      | 4 ----
 .../main/java/org/jclouds/ovf/DeploymentOptionSection.java    | 2 --
 compute/src/main/java/org/jclouds/ovf/Disk.java               | 4 ----
 compute/src/main/java/org/jclouds/ovf/DiskSection.java        | 2 --
 compute/src/main/java/org/jclouds/ovf/Envelope.java           | 3 ---
 compute/src/main/java/org/jclouds/ovf/Network.java            | 4 ----
 compute/src/main/java/org/jclouds/ovf/NetworkSection.java     | 2 --
 .../src/main/java/org/jclouds/ovf/OperatingSystemSection.java | 2 --
 compute/src/main/java/org/jclouds/ovf/ProductSection.java     | 2 --
 compute/src/main/java/org/jclouds/ovf/Property.java           | 4 ----
 compute/src/main/java/org/jclouds/ovf/Section.java            | 2 --
 .../src/main/java/org/jclouds/ovf/VirtualHardwareSection.java | 2 --
 compute/src/main/java/org/jclouds/ovf/VirtualSystem.java      | 3 ---
 .../src/main/java/org/jclouds/ovf/internal/BaseEnvelope.java  | 3 ---
 .../main/java/org/jclouds/ovf/internal/BaseVirtualSystem.java | 3 ---
 .../org/jclouds/ovf/xml/DeploymentOptionSectionHandler.java   | 3 ---
 .../src/main/java/org/jclouds/ovf/xml/DiskSectionHandler.java | 3 ---
 .../src/main/java/org/jclouds/ovf/xml/EnvelopeHandler.java    | 3 ---
 .../main/java/org/jclouds/ovf/xml/NetworkSectionHandler.java  | 3 ---
 .../org/jclouds/ovf/xml/OperatingSystemSectionHandler.java    | 3 ---
 .../main/java/org/jclouds/ovf/xml/ProductSectionHandler.java  | 3 ---
 compute/src/main/java/org/jclouds/ovf/xml/SectionHandler.java | 3 ---
 .../org/jclouds/ovf/xml/VirtualHardwareSectionHandler.java    | 3 ---
 .../main/java/org/jclouds/ovf/xml/VirtualSystemHandler.java   | 3 ---
 .../org/jclouds/ovf/xml/internal/BaseEnvelopeHandler.java     | 3 ---
 .../jclouds/ovf/xml/internal/BaseVirtualSystemHandler.java    | 3 ---
 compute/src/main/java/org/jclouds/ssh/SshClient.java          | 3 ---
 compute/src/main/java/org/jclouds/ssh/SshException.java       | 3 ---
 compute/src/main/java/org/jclouds/ssh/SshKeys.java            | 1 -
 .../main/java/org/jclouds/ssh/config/ConfiguresSshClient.java | 3 ---
 .../cim/xml/ResourceAllocationSettingDataHandlerTest.java     | 2 --
 .../jclouds/cim/xml/VirtualSystemSettingDataHandlerTest.java  | 2 --
 .../src/test/java/org/jclouds/compute/ComputeTestUtils.java   | 2 --
 .../src/test/java/org/jclouds/compute/JettyStatements.java    | 4 ----
 .../jclouds/compute/StubComputeServiceIntegrationTest.java    | 5 -----
 .../jclouds/compute/StubTemplateBuilderIntegrationTest.java   | 5 -----
 .../BlockUntilInitScriptStatusIsZeroThenReturnOutputTest.java | 3 ---
 .../callables/InitScriptConfigurationForTasksTest.java        | 3 ---
 ...ptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest.java | 3 ---
 .../callables/RunScriptOnNodeAsInitScriptUsingSshTest.java    | 3 ---
 .../compute/callables/RunScriptOnNodeUsingSshTest.java        | 3 ---
 .../compute/callables/ScriptStillRunningExceptionTest.java    | 3 ---
 .../jclouds/compute/config/ComputeServicePropertiesTest.java  | 4 ----
 ...iderFromPropertiesAndStoreCredentialsOrReturnNullTest.java | 4 ----
 .../jclouds/compute/config/PersistNodeCredentialsTest.java    | 4 ----
 .../java/org/jclouds/compute/domain/ImageBuilderTest.java     | 1 -
 .../org/jclouds/compute/domain/TemplateBuilderSpecTest.java   | 2 --
 ...llEqualToIsParentOrIsGrandparentOfCurrentLocationTest.java | 4 ----
 .../compute/domain/internal/TemplateBuilderImplTest.java      | 4 ----
 .../extensions/internal/BaseImageExtensionLiveTest.java       | 3 ---
 .../internal/BaseSecurityGroupExtensionLiveTest.java          | 3 ---
 ...efaultCredentialsFromImageOrOverridingCredentialsTest.java | 4 ----
 .../org/jclouds/compute/functions/PollNodeRunningTest.java    | 3 ---
 .../java/org/jclouds/compute/functions/Sha512CryptTest.java   | 3 ---
 .../compute/internal/BaseComputeServiceApiMetadataTest.java   | 4 ----
 .../compute/internal/BaseComputeServiceContextLiveTest.java   | 3 ---
 .../jclouds/compute/internal/BaseComputeServiceLiveTest.java  | 4 ----
 .../internal/BaseGenericComputeServiceContextLiveTest.java    | 3 ---
 .../jclouds/compute/internal/BaseTemplateBuilderLiveTest.java | 4 ----
 ...haredNamesAndAppendUniqueStringToThoseWhichRepeatTest.java | 4 ----
 .../java/org/jclouds/compute/options/TemplateOptionsTest.java | 2 --
 .../jclouds/compute/predicates/AtomicNodePredicatesTest.java  | 2 --
 .../jclouds/compute/predicates/HardwarePredicatesTest.java    | 4 ----
 .../org/jclouds/compute/predicates/ImagePredicatesTest.java   | 4 ----
 .../compute/predicates/OperatingSystemPredicatesTest.java     | 2 --
 ...tomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMapTest.java | 3 ---
 .../strategy/PrioritizeCredentialsFromTemplateTest.java       | 4 ----
 .../strategy/impl/ReturnCredentialsBoundToImageTest.java      | 4 ----
 .../java/org/jclouds/compute/stub/StubApiMetadataTest.java    | 4 ----
 .../extensions/StubSecurityGroupExtensionIntegrationTest.java | 3 ---
 .../org/jclouds/compute/util/ComputeServiceUtilsTest.java     | 3 ---
 .../src/test/java/org/jclouds/net/util/IpPermissionsTest.java | 2 --
 .../test/java/org/jclouds/ovf/xml/DiskSectionHandlerTest.java | 2 --
 .../test/java/org/jclouds/ovf/xml/EnvelopeHandlerTest.java    | 2 --
 .../java/org/jclouds/ovf/xml/NetworkSectionHandlerTest.java   | 2 --
 .../jclouds/ovf/xml/OperatingSystemSectionHandlerTest.java    | 2 --
 .../java/org/jclouds/ovf/xml/ProductSectionHandlerTest.java   | 2 --
 compute/src/test/java/org/jclouds/ssh/SshKeysTest.java        | 4 ----
 .../org/jclouds/ssh/config/RsaSshKeyPairGeneratorTest.java    | 3 ---
 core/src/main/java/org/jclouds/Constants.java                 | 2 --
 core/src/main/java/org/jclouds/Context.java                   | 4 ----
 core/src/main/java/org/jclouds/ContextBuilder.java            | 1 -
 core/src/main/java/org/jclouds/Fallback.java                  | 1 -
 core/src/main/java/org/jclouds/Fallbacks.java                 | 5 -----
 core/src/main/java/org/jclouds/JcloudsVersion.java            | 4 ----
 core/src/main/java/org/jclouds/View.java                      | 3 ---
 core/src/main/java/org/jclouds/apis/ApiMetadata.java          | 1 -
 core/src/main/java/org/jclouds/apis/ApiPredicates.java        | 2 --
 core/src/main/java/org/jclouds/apis/Apis.java                 | 2 --
 .../main/java/org/jclouds/apis/internal/BaseApiMetadata.java  | 2 --
 .../src/main/java/org/jclouds/collect/IterableWithMarker.java | 2 --
 .../main/java/org/jclouds/collect/IterableWithMarkers.java    | 2 --
 core/src/main/java/org/jclouds/collect/Memoized.java          | 2 --
 core/src/main/java/org/jclouds/collect/PagedIterable.java     | 2 --
 core/src/main/java/org/jclouds/collect/PagedIterables.java    | 2 --
 core/src/main/java/org/jclouds/collect/TransformingMap.java   | 3 ---
 .../org/jclouds/collect/internal/Arg0ToPagedIterable.java     | 3 ---
 .../org/jclouds/collect/internal/ArgsToPagedIterable.java     | 3 ---
 .../jclouds/collect/internal/CallerArg0ToPagedIterable.java   | 1 -
 .../main/java/org/jclouds/concurrent/DynamicExecutors.java    | 2 --
 .../org/jclouds/concurrent/DynamicThreadPoolExecutor.java     | 3 ---
 .../src/main/java/org/jclouds/concurrent/FutureIterables.java | 2 --
 core/src/main/java/org/jclouds/concurrent/SingleThreaded.java | 3 ---
 .../org/jclouds/concurrent/TransformParallelException.java    | 2 --
 .../jclouds/concurrent/config/ConfiguresExecutorService.java  | 3 ---
 .../org/jclouds/concurrent/config/ExecutorServiceModule.java  | 2 --
 .../concurrent/config/ScheduledExecutorServiceModule.java     | 2 --
 .../org/jclouds/concurrent/config/WithSubmissionTrace.java    | 4 ----
 .../BindApiContextWithWildcardExtendsExplicitAndRawType.java  | 2 --
 .../org/jclouds/config/BindPropertiesToExpandedValues.java    | 2 --
 .../BindRestContextWithWildcardExtendsExplicitAndRawType.java | 1 -
 .../org/jclouds/config/ValueOfConfigurationKeyOrNull.java     | 4 ----
 core/src/main/java/org/jclouds/crypto/ASN1Codec.java          | 2 --
 core/src/main/java/org/jclouds/crypto/Crypto.java             | 2 --
 core/src/main/java/org/jclouds/crypto/Macs.java               | 2 --
 core/src/main/java/org/jclouds/crypto/Pems.java               | 2 --
 core/src/main/java/org/jclouds/date/DateCodec.java            | 1 -
 core/src/main/java/org/jclouds/date/DateCodecFactory.java     | 1 -
 core/src/main/java/org/jclouds/date/DateService.java          | 3 ---
 core/src/main/java/org/jclouds/date/TimeStamp.java            | 3 ---
 core/src/main/java/org/jclouds/date/internal/DateUtils.java   | 4 ----
 .../jclouds/date/internal/SimpleDateFormatDateService.java    | 3 ---
 core/src/main/java/org/jclouds/domain/Credentials.java        | 3 ---
 core/src/main/java/org/jclouds/domain/JsonBall.java           | 1 -
 core/src/main/java/org/jclouds/domain/Location.java           | 2 --
 core/src/main/java/org/jclouds/domain/LocationBuilder.java    | 4 ----
 core/src/main/java/org/jclouds/domain/LocationScope.java      | 1 -
 core/src/main/java/org/jclouds/domain/LoginCredentials.java   | 3 ---
 .../main/java/org/jclouds/domain/MutableResourceMetadata.java | 2 --
 core/src/main/java/org/jclouds/domain/ResourceMetadata.java   | 2 --
 .../main/java/org/jclouds/domain/ResourceMetadataBuilder.java | 4 ----
 .../main/java/org/jclouds/domain/internal/LocationImpl.java   | 4 ----
 .../jclouds/domain/internal/MutableResourceMetadataImpl.java  | 2 --
 .../org/jclouds/domain/internal/ResourceMetadataImpl.java     | 2 --
 .../main/java/org/jclouds/encryption/internal/JCECrypto.java  | 4 ----
 .../java/org/jclouds/events/config/ConfiguresEventBus.java    | 2 --
 .../main/java/org/jclouds/events/config/EventBusModule.java   | 1 -
 .../java/org/jclouds/events/config/annotations/AsyncBus.java  | 1 -
 .../org/jclouds/events/handlers/DeadEventLoggingHandler.java  | 2 --
 .../org/jclouds/fallbacks/HeaderToRetryAfterException.java    | 1 -
 .../org/jclouds/fallbacks/MapHttp4xxCodesToExceptions.java    | 4 ----
 .../java/org/jclouds/fallbacks/PropagateIfRetryAfter.java     | 2 --
 .../src/main/java/org/jclouds/functions/IdentityFunction.java | 5 -----
 core/src/main/java/org/jclouds/functions/JoinOnComma.java     | 5 -----
 .../main/java/org/jclouds/functions/OnlyElementOrNull.java    | 3 ---
 core/src/main/java/org/jclouds/functions/ToLowerCase.java     | 3 ---
 core/src/main/java/org/jclouds/http/HttpCommand.java          | 2 --
 .../java/org/jclouds/http/HttpCommandExecutorService.java     | 2 --
 core/src/main/java/org/jclouds/http/HttpErrorHandler.java     | 2 --
 core/src/main/java/org/jclouds/http/HttpException.java        | 2 --
 core/src/main/java/org/jclouds/http/HttpMessage.java          | 2 --
 core/src/main/java/org/jclouds/http/HttpRequest.java          | 2 --
 core/src/main/java/org/jclouds/http/HttpRequestFilter.java    | 2 --
 core/src/main/java/org/jclouds/http/HttpResponse.java         | 2 --
 .../src/main/java/org/jclouds/http/HttpResponseException.java | 3 ---
 core/src/main/java/org/jclouds/http/HttpRetryHandler.java     | 2 --
 core/src/main/java/org/jclouds/http/HttpUtils.java            | 3 ---
 .../main/java/org/jclouds/http/IOExceptionRetryHandler.java   | 4 ----
 core/src/main/java/org/jclouds/http/UriTemplates.java         | 5 -----
 core/src/main/java/org/jclouds/http/Uris.java                 | 4 ----
 .../main/java/org/jclouds/http/annotation/ClientError.java    | 2 --
 .../main/java/org/jclouds/http/annotation/Redirection.java    | 2 --
 .../main/java/org/jclouds/http/annotation/ServerError.java    | 2 --
 .../http/config/ConfiguresHttpCommandExecutorService.java     | 3 ---
 .../http/config/JavaUrlHttpCommandExecutorServiceModule.java  | 2 --
 core/src/main/java/org/jclouds/http/config/SSLModule.java     | 7 -------
 .../java/org/jclouds/http/filters/BasicAuthentication.java    | 2 --
 .../main/java/org/jclouds/http/filters/StripExpectHeader.java | 3 ---
 .../main/java/org/jclouds/http/functions/ParseETagHeader.java | 2 --
 .../org/jclouds/http/functions/ParseFirstJsonValueNamed.java  | 3 ---
 core/src/main/java/org/jclouds/http/functions/ParseJson.java  | 2 --
 core/src/main/java/org/jclouds/http/functions/ParseSax.java   | 3 ---
 .../http/functions/ParseURIFromListOrLocationHeaderIf20x.java | 2 --
 .../java/org/jclouds/http/functions/ParseXMLWithJAXB.java     | 2 --
 .../org/jclouds/http/functions/ReleasePayloadAndReturn.java   | 4 ----
 .../java/org/jclouds/http/functions/ReturnInputStream.java    | 2 --
 .../java/org/jclouds/http/functions/ReturnStringIf2xx.java    | 4 ----
 .../main/java/org/jclouds/http/functions/ReturnTrueIf2xx.java | 2 --
 .../java/org/jclouds/http/functions/UnwrapOnlyJsonValue.java  | 3 ---
 .../org/jclouds/http/functions/UnwrapOnlyJsonValueInSet.java  | 3 ---
 .../org/jclouds/http/functions/config/SaxParserModule.java    | 2 --
 .../org/jclouds/http/handlers/BackoffLimitedRetryHandler.java | 2 --
 .../handlers/CloseContentAndSetExceptionErrorHandler.java     | 4 ----
 .../org/jclouds/http/handlers/DelegatingErrorHandler.java     | 2 --
 .../org/jclouds/http/handlers/DelegatingRetryHandler.java     | 2 --
 .../org/jclouds/http/handlers/RedirectionRetryHandler.java    | 2 --
 .../jclouds/http/internal/BaseHttpCommandExecutorService.java | 4 ----
 core/src/main/java/org/jclouds/http/internal/HttpWire.java    | 4 ----
 .../http/internal/JavaUrlHttpCommandExecutorService.java      | 2 --
 .../java/org/jclouds/http/internal/PayloadEnclosingImpl.java  | 4 ----
 .../main/java/org/jclouds/http/internal/SignatureWire.java    | 3 ---
 .../java/org/jclouds/http/options/BaseHttpRequestOptions.java | 2 --
 core/src/main/java/org/jclouds/http/options/GetOptions.java   | 3 ---
 .../java/org/jclouds/http/options/HttpRequestOptions.java     | 3 ---
 core/src/main/java/org/jclouds/http/utils/Queries.java        | 4 ----
 core/src/main/java/org/jclouds/internal/BaseView.java         | 3 ---
 core/src/main/java/org/jclouds/internal/ContextImpl.java      | 3 ---
 .../jclouds/internal/FilterStringsBoundToInjectorByName.java  | 2 --
 core/src/main/java/org/jclouds/io/ByteSources.java            | 2 --
 core/src/main/java/org/jclouds/io/ContentMetadata.java        | 3 ---
 core/src/main/java/org/jclouds/io/ContentMetadataBuilder.java | 3 ---
 core/src/main/java/org/jclouds/io/ContentMetadataCodec.java   | 1 -
 core/src/main/java/org/jclouds/io/MutableContentMetadata.java | 3 ---
 core/src/main/java/org/jclouds/io/Payload.java                | 3 ---
 core/src/main/java/org/jclouds/io/PayloadEnclosing.java       | 4 ----
 core/src/main/java/org/jclouds/io/PayloadSlicer.java          | 4 ----
 core/src/main/java/org/jclouds/io/Payloads.java               | 4 ----
 .../main/java/org/jclouds/io/internal/BasePayloadSlicer.java  | 4 ----
 .../main/java/org/jclouds/io/payloads/BaseCipherPayload.java  | 4 ----
 .../org/jclouds/io/payloads/BaseImmutableContentMetadata.java | 3 ---
 .../org/jclouds/io/payloads/BaseMutableContentMetadata.java   | 3 ---
 core/src/main/java/org/jclouds/io/payloads/BasePayload.java   | 3 ---
 .../main/java/org/jclouds/io/payloads/ByteArrayPayload.java   | 1 -
 .../main/java/org/jclouds/io/payloads/ByteSourcePayload.java  | 2 --
 .../main/java/org/jclouds/io/payloads/DelegatingPayload.java  | 4 ----
 core/src/main/java/org/jclouds/io/payloads/FilePayload.java   | 1 -
 .../main/java/org/jclouds/io/payloads/InputStreamPayload.java | 3 ---
 .../org/jclouds/io/payloads/InputStreamSupplierPayload.java   | 1 -
 core/src/main/java/org/jclouds/io/payloads/MultipartForm.java | 4 ----
 core/src/main/java/org/jclouds/io/payloads/Part.java          | 4 ----
 .../src/main/java/org/jclouds/io/payloads/PhantomPayload.java | 3 ---
 .../java/org/jclouds/io/payloads/RSADecryptingPayload.java    | 4 ----
 .../java/org/jclouds/io/payloads/RSAEncryptingPayload.java    | 4 ----
 core/src/main/java/org/jclouds/io/payloads/StringPayload.java | 1 -
 .../java/org/jclouds/io/payloads/UrlEncodedFormPayload.java   | 3 ---
 core/src/main/java/org/jclouds/json/Json.java                 | 3 ---
 core/src/main/java/org/jclouds/json/config/GsonModule.java    | 2 --
 ...rializationConstructorAndReflectiveTypeAdapterFactory.java | 3 ---
 .../json/internal/EnumTypeAdapterThatReturnsFromValue.java    | 3 ---
 core/src/main/java/org/jclouds/json/internal/GsonWrapper.java | 3 ---
 .../main/java/org/jclouds/json/internal/NamingStrategies.java | 3 ---
 .../json/internal/NullFilteringTypeAdapterFactories.java      | 2 --
 .../org/jclouds/json/internal/NullHackJsonLiteralAdapter.java | 1 -
 .../org/jclouds/json/internal/OptionalTypeAdapterFactory.java | 2 --
 core/src/main/java/org/jclouds/lifecycle/BaseLifeCycle.java   | 2 --
 core/src/main/java/org/jclouds/lifecycle/Closer.java          | 2 --
 core/src/main/java/org/jclouds/lifecycle/LifeCycle.java       | 2 --
 .../java/org/jclouds/lifecycle/config/LifeCycleModule.java    | 2 --
 core/src/main/java/org/jclouds/location/Iso3166.java          | 3 ---
 core/src/main/java/org/jclouds/location/Provider.java         | 2 --
 core/src/main/java/org/jclouds/location/Region.java           | 3 ---
 core/src/main/java/org/jclouds/location/Zone.java             | 3 ---
 .../main/java/org/jclouds/location/config/LocationModule.java | 2 --
 .../java/org/jclouds/location/functions/RegionToEndpoint.java | 4 ----
 .../location/functions/RegionToEndpointOrProviderIfNull.java  | 2 --
 .../java/org/jclouds/location/functions/ToIdAndScope.java     | 5 -----
 .../java/org/jclouds/location/functions/ZoneToEndpoint.java   | 4 ----
 .../org/jclouds/location/predicates/LocationPredicates.java   | 4 ----
 .../java/org/jclouds/location/predicates/RegionIdFilter.java  | 2 --
 .../java/org/jclouds/location/predicates/ZoneIdFilter.java    | 2 --
 .../predicates/fromconfig/AnyOrConfiguredRegionId.java        | 2 --
 .../location/predicates/fromconfig/AnyOrConfiguredZoneId.java | 2 --
 .../org/jclouds/location/reference/LocationConstants.java     | 4 ----
 .../jclouds/location/suppliers/ImplicitLocationSupplier.java  | 4 ----
 .../jclouds/location/suppliers/ImplicitRegionIdSupplier.java  | 4 ----
 .../location/suppliers/LocationIdToIso3166CodesSupplier.java  | 2 --
 .../org/jclouds/location/suppliers/LocationsSupplier.java     | 4 ----
 .../org/jclouds/location/suppliers/RegionIdToURISupplier.java | 5 -----
 .../jclouds/location/suppliers/RegionIdToZoneIdsSupplier.java | 1 -
 .../org/jclouds/location/suppliers/RegionIdsSupplier.java     | 1 -
 .../org/jclouds/location/suppliers/ZoneIdToURISupplier.java   | 5 -----
 .../java/org/jclouds/location/suppliers/ZoneIdsSupplier.java  | 4 ----
 .../java/org/jclouds/location/suppliers/all/JustProvider.java | 4 ----
 .../org/jclouds/location/suppliers/all/RegionToProvider.java  | 4 ----
 .../suppliers/all/RegionToProviderOrJustProvider.java         | 4 ----
 .../org/jclouds/location/suppliers/all/ZoneToProvider.java    | 4 ----
 .../suppliers/all/ZoneToRegionToProviderOrJustProvider.java   | 4 ----
 .../suppliers/derived/ZoneIdToURIFromJoinOnRegionIdToURI.java | 3 ---
 .../fromconfig/LocationIdToIso3166CodesFromConfiguration.java | 2 --
 .../RegionIdToURIFromConfigurationOrDefaultToProvider.java    | 2 --
 .../fromconfig/RegionIdToZoneIdsFromConfiguration.java        | 2 --
 .../suppliers/fromconfig/RegionIdsFromConfiguration.java      | 2 --
 .../ZoneIdToURIFromConfigurationOrDefaultToProvider.java      | 2 --
 .../suppliers/fromconfig/ZoneIdsFromConfiguration.java        | 2 --
 .../org/jclouds/location/suppliers/implicit/FirstNetwork.java | 5 -----
 .../org/jclouds/location/suppliers/implicit/FirstRegion.java  | 5 -----
 .../org/jclouds/location/suppliers/implicit/FirstZone.java    | 5 -----
 .../OnlyLocationOrFirstRegionOptionallyMatchingRegionId.java  | 3 ---
 .../location/suppliers/implicit/OnlyLocationOrFirstZone.java  | 5 -----
 core/src/main/java/org/jclouds/logging/BaseLogger.java        | 3 ---
 core/src/main/java/org/jclouds/logging/ConsoleLogger.java     | 3 ---
 core/src/main/java/org/jclouds/logging/Logger.java            | 3 ---
 core/src/main/java/org/jclouds/logging/LoggingModules.java    | 2 --
 core/src/main/java/org/jclouds/logging/NullLogger.java        | 3 ---
 .../logging/config/BindLoggersAnnotatedWithResource.java      | 2 --
 .../java/org/jclouds/logging/config/ConsoleLoggingModule.java | 3 ---
 .../main/java/org/jclouds/logging/config/LoggingModule.java   | 3 ---
 .../java/org/jclouds/logging/config/NullLoggingModule.java    | 3 ---
 core/src/main/java/org/jclouds/logging/internal/Wire.java     | 2 --
 core/src/main/java/org/jclouds/logging/jdk/JDKLogger.java     | 3 ---
 .../java/org/jclouds/logging/jdk/config/JDKLoggingModule.java | 3 ---
 core/src/main/java/org/jclouds/osgi/Bundles.java              | 2 --
 .../main/java/org/jclouds/osgi/MetadataBundleListener.java    | 2 --
 .../java/org/jclouds/predicates/InetSocketAddressConnect.java | 2 --
 core/src/main/java/org/jclouds/predicates/SocketOpen.java     | 2 --
 .../java/org/jclouds/predicates/SocketOpenUnsupported.java    | 5 -----
 core/src/main/java/org/jclouds/predicates/Validator.java      | 2 --
 .../org/jclouds/predicates/validators/DnsNameValidator.java   | 2 --
 .../java/org/jclouds/providers/AnonymousProviderMetadata.java | 2 --
 .../src/main/java/org/jclouds/providers/ProviderMetadata.java | 3 ---
 .../main/java/org/jclouds/providers/ProviderPredicates.java   | 2 --
 core/src/main/java/org/jclouds/providers/Providers.java       | 2 --
 .../config/BindProviderMetadataContextAndCredentials.java     | 3 ---
 .../org/jclouds/providers/internal/BaseProviderMetadata.java  | 2 --
 .../internal/UpdateProviderMetadataFromProperties.java        | 2 --
 core/src/main/java/org/jclouds/proxy/ProxyConfig.java         | 3 ---
 core/src/main/java/org/jclouds/proxy/ProxyForURI.java         | 3 ---
 .../java/org/jclouds/proxy/internal/GuiceProxyConfig.java     | 2 --
 core/src/main/java/org/jclouds/reflect/Invocation.java        | 2 --
 core/src/main/java/org/jclouds/reflect/InvocationSuccess.java | 2 --
 .../main/java/org/jclouds/rest/AnonymousHttpApiMetadata.java  | 2 --
 .../main/java/org/jclouds/rest/AnonymousRestApiMetadata.java  | 1 -
 core/src/main/java/org/jclouds/rest/ApiContext.java           | 3 ---
 .../main/java/org/jclouds/rest/AuthorizationException.java    | 2 --
 core/src/main/java/org/jclouds/rest/Binder.java               | 2 --
 .../main/java/org/jclouds/rest/ConfiguresCredentialStore.java | 3 ---
 core/src/main/java/org/jclouds/rest/ConfiguresHttpApi.java    | 3 ---
 core/src/main/java/org/jclouds/rest/ConfiguresRestClient.java | 3 ---
 core/src/main/java/org/jclouds/rest/HttpApiMetadata.java      | 1 -
 core/src/main/java/org/jclouds/rest/HttpAsyncClient.java      | 1 -
 core/src/main/java/org/jclouds/rest/HttpClient.java           | 2 --
 core/src/main/java/org/jclouds/rest/InputParamValidator.java  | 2 --
 .../java/org/jclouds/rest/InsufficientResourcesException.java | 2 --
 core/src/main/java/org/jclouds/rest/InvocationContext.java    | 1 -
 core/src/main/java/org/jclouds/rest/MapBinder.java            | 3 ---
 core/src/main/java/org/jclouds/rest/RequestSigner.java        | 4 ----
 .../java/org/jclouds/rest/ResourceAlreadyExistsException.java | 2 --
 .../main/java/org/jclouds/rest/ResourceNotFoundException.java | 2 --
 core/src/main/java/org/jclouds/rest/RestApiMetadata.java      | 1 -
 core/src/main/java/org/jclouds/rest/RestContext.java          | 1 -
 core/src/main/java/org/jclouds/rest/Utils.java                | 6 ------
 core/src/main/java/org/jclouds/rest/annotations/Api.java      | 2 --
 .../main/java/org/jclouds/rest/annotations/ApiVersion.java    | 1 -
 .../main/java/org/jclouds/rest/annotations/BinderParam.java   | 2 --
 .../main/java/org/jclouds/rest/annotations/BuildVersion.java  | 1 -
 core/src/main/java/org/jclouds/rest/annotations/Delegate.java | 2 --
 core/src/main/java/org/jclouds/rest/annotations/Endpoint.java | 2 --
 .../main/java/org/jclouds/rest/annotations/EndpointParam.java | 1 -
 core/src/main/java/org/jclouds/rest/annotations/Fallback.java | 1 -
 .../main/java/org/jclouds/rest/annotations/FormParams.java    | 1 -
 core/src/main/java/org/jclouds/rest/annotations/Headers.java  | 1 -
 .../java/org/jclouds/rest/annotations/JAXBResponseParser.java | 2 --
 .../src/main/java/org/jclouds/rest/annotations/MapBinder.java | 2 --
 .../main/java/org/jclouds/rest/annotations/OnlyElement.java   | 1 -
 .../org/jclouds/rest/annotations/OverrideRequestFilters.java  | 2 --
 core/src/main/java/org/jclouds/rest/annotations/PATCH.java    | 3 ---
 .../main/java/org/jclouds/rest/annotations/ParamParser.java   | 1 -
 .../java/org/jclouds/rest/annotations/ParamValidators.java    | 2 --
 .../src/main/java/org/jclouds/rest/annotations/PartParam.java | 2 --
 core/src/main/java/org/jclouds/rest/annotations/Payload.java  | 2 --
 .../main/java/org/jclouds/rest/annotations/PayloadParam.java  | 2 --
 .../main/java/org/jclouds/rest/annotations/PayloadParams.java | 1 -
 .../main/java/org/jclouds/rest/annotations/QueryParams.java   | 1 -
 .../java/org/jclouds/rest/annotations/RequestFilters.java     | 2 --
 .../java/org/jclouds/rest/annotations/ResponseParser.java     | 2 --
 .../main/java/org/jclouds/rest/annotations/SelectJson.java    | 2 --
 .../java/org/jclouds/rest/annotations/SinceApiVersion.java    | 1 -
 .../main/java/org/jclouds/rest/annotations/SkipEncoding.java  | 2 --
 .../src/main/java/org/jclouds/rest/annotations/Transform.java | 2 --
 core/src/main/java/org/jclouds/rest/annotations/Unwrap.java   | 2 --
 .../main/java/org/jclouds/rest/annotations/VirtualHost.java   | 2 --
 core/src/main/java/org/jclouds/rest/annotations/WrapWith.java | 2 --
 .../java/org/jclouds/rest/annotations/XMLResponseParser.java  | 2 --
 .../main/java/org/jclouds/rest/binders/BindAsHostPrefix.java  | 4 ----
 .../src/main/java/org/jclouds/rest/binders/BindException.java | 2 --
 .../java/org/jclouds/rest/binders/BindMapToStringPayload.java | 4 ----
 .../main/java/org/jclouds/rest/binders/BindToJsonPayload.java | 2 --
 .../jclouds/rest/binders/BindToJsonPayloadWrappedWith.java    | 2 --
 .../java/org/jclouds/rest/binders/BindToStringPayload.java    | 2 --
 .../main/java/org/jclouds/rest/binders/BindToXMLPayload.java  | 2 --
 .../org/jclouds/rest/config/AnnotatedHttpApiProvider.java     | 4 ----
 .../rest/config/AnnotatedSyncToAsyncHttpApiProvider.java      | 1 -
 core/src/main/java/org/jclouds/rest/config/BinderUtils.java   | 4 ----
 .../org/jclouds/rest/config/CallGetOnFuturesProvider.java     | 1 -
 .../java/org/jclouds/rest/config/CredentialStoreModule.java   | 4 ----
 core/src/main/java/org/jclouds/rest/config/HttpApiModule.java | 4 ----
 .../main/java/org/jclouds/rest/config/InvocationConfig.java   | 2 --
 .../main/java/org/jclouds/rest/config/RestClientModule.java   | 1 -
 core/src/main/java/org/jclouds/rest/config/SetCaller.java     | 2 --
 .../org/jclouds/rest/config/SyncToAsyncHttpApiProvider.java   | 1 -
 .../functions/AlwaysPresentImplicitOptionalConverter.java     | 4 ----
 .../org/jclouds/rest/functions/ImplicitOptionalConverter.java | 2 --
 ...enApiVersionLexicographicallyAtOrAfterSinceApiVersion.java | 4 ----
 .../main/java/org/jclouds/rest/internal/ApiContextImpl.java   | 1 -
 .../java/org/jclouds/rest/internal/BaseHttpApiMetadata.java   | 2 --
 .../java/org/jclouds/rest/internal/BaseRestApiMetadata.java   | 1 -
 .../java/org/jclouds/rest/internal/GeneratedHttpRequest.java  | 4 ----
 .../org/jclouds/rest/internal/InvokeAndCallGetOnFutures.java  | 1 -
 .../main/java/org/jclouds/rest/internal/InvokeHttpMethod.java | 3 ---
 .../jclouds/rest/internal/InvokeSyncToAsyncHttpMethod.java    | 1 -
 .../org/jclouds/rest/internal/RestAnnotationProcessor.java    | 4 ----
 .../main/java/org/jclouds/rest/internal/RestContextImpl.java  | 1 -
 core/src/main/java/org/jclouds/rest/internal/UtilsImpl.java   | 3 ---
 ...dRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java | 2 --
 .../suppliers/SetAndThrowAuthorizationExceptionSupplier.java  | 4 ----
 .../org/jclouds/suppliers/SupplyKeyMatchingValueOrNull.java   | 2 --
 core/src/main/java/org/jclouds/util/InetAddresses2.java       | 5 -----
 core/src/main/java/org/jclouds/util/Maps2.java                | 2 --
 core/src/main/java/org/jclouds/util/Multimaps2.java           | 4 ----
 core/src/main/java/org/jclouds/util/Optionals2.java           | 4 ----
 core/src/main/java/org/jclouds/util/Patterns.java             | 4 ----
 core/src/main/java/org/jclouds/util/SaxUtils.java             | 4 ----
 core/src/main/java/org/jclouds/util/Strings2.java             | 5 -----
 core/src/main/java/org/jclouds/util/Suppliers2.java           | 4 ----
 core/src/main/java/org/jclouds/util/Throwables2.java          | 2 --
 core/src/main/java/org/jclouds/xml/XMLParser.java             | 2 --
 core/src/main/java/org/jclouds/xml/internal/JAXBParser.java   | 1 -
 core/src/test/java/org/jclouds/ContextBuilderTest.java        | 2 --
 core/src/test/java/org/jclouds/JcloudsVersionTest.java        | 3 ---
 core/src/test/java/org/jclouds/PerformanceTest.java           | 4 ----
 core/src/test/java/org/jclouds/apis/ApisTest.java             | 2 --
 core/src/test/java/org/jclouds/apis/BaseApiLiveTest.java      | 4 ----
 core/src/test/java/org/jclouds/apis/BaseContextLiveTest.java  | 4 ----
 core/src/test/java/org/jclouds/apis/BaseViewLiveTest.java     | 4 ----
 .../org/jclouds/apis/JcloudsTestBlobStoreApiMetadata.java     | 2 --
 .../java/org/jclouds/apis/JcloudsTestComputeApiMetadata.java  | 2 --
 .../jclouds/apis/JcloudsTestYetAnotherComputeApiMetadata.java | 2 --
 .../java/org/jclouds/apis/internal/BaseApiMetadataTest.java   | 4 ----
 .../org/jclouds/collect/AdvanceUntilEmptyIterableTest.java    | 2 --
 .../java/org/jclouds/collect/IterableWithMarkersTest.java     | 2 --
 .../src/test/java/org/jclouds/collect/PagedIterablesTest.java | 2 --
 .../org/jclouds/collect/internal/Arg0ToPagedIterableTest.java | 3 ---
 .../org/jclouds/collect/internal/ArgsToPagedIterableTest.java | 3 ---
 .../test/java/org/jclouds/concurrent/FutureIterablesTest.java | 2 --
 .../jclouds/concurrent/config/ExecutorServiceModuleTest.java  | 4 ----
 .../concurrent/config/ScheduledExecutorServiceModuleTest.java | 4 ----
 ...ndApiContextWithWildcardExtendsExplicitAndRawTypeTest.java | 4 ----
 .../jclouds/config/BindPropertiesToExpandedValuesTest.java    | 2 --
 ...dRestContextWithWildcardExtendsExplicitAndRawTypeTest.java | 4 ----
 .../org/jclouds/config/ValueOfConfigurationKeyOrNullTest.java | 2 --
 core/src/test/java/org/jclouds/crypto/PemsTest.java           | 4 ----
 core/src/test/java/org/jclouds/date/DateServiceTest.java      | 3 ---
 .../date/internal/DateServiceDateCodecFactoryTest.java        | 5 -----
 core/src/test/java/org/jclouds/domain/CredentialsTest.java    | 3 ---
 core/src/test/java/org/jclouds/domain/JsonBallTest.java       | 3 ---
 core/src/test/java/org/jclouds/domain/JsonObjectTest.java     | 3 ---
 .../test/java/org/jclouds/domain/LoginCredentialsTest.java    | 3 ---
 .../java/org/jclouds/events/config/EventBusModuleTest.java    | 2 --
 .../jclouds/fallbacks/HeaderToRetryAfterExceptionTest.java    | 4 ----
 .../jclouds/fallbacks/MapHttp4xxCodesToExceptionsTest.java    | 4 ----
 .../test/java/org/jclouds/functions/CacheLearningTest.java    | 4 ----
 core/src/test/java/org/jclouds/functions/JoinOnCommaTest.java | 4 ----
 .../java/org/jclouds/http/BackoffLimitedRetryJavaTest.java    | 3 ---
 .../http/BaseHttpCommandExecutorServiceIntegrationTest.java   | 3 ---
 .../test/java/org/jclouds/http/BaseHttpErrorHandlerTest.java  | 4 ----
 .../src/test/java/org/jclouds/http/BaseMockWebServerTest.java | 2 --
 core/src/test/java/org/jclouds/http/HttpMessageTest.java      | 4 ----
 core/src/test/java/org/jclouds/http/HttpRequestTest.java      | 2 --
 .../java/org/jclouds/http/IntegrationTestAsyncClient.java     | 1 -
 .../src/test/java/org/jclouds/http/IntegrationTestClient.java | 2 --
 .../org/jclouds/http/IntegrationTestClientExpectTest.java     | 2 --
 .../JavaUrlHttpCommandExecutorServiceIntegrationTest.java     | 2 --
 .../org/jclouds/http/TransformingHttpCommandImplTest.java     | 4 ----
 core/src/test/java/org/jclouds/http/UriTemplatesTest.java     | 4 ----
 core/src/test/java/org/jclouds/http/UrisTest.java             | 4 ----
 .../org/jclouds/http/filters/BasicAuthenticationTest.java     | 4 ----
 .../java/org/jclouds/http/filters/StripExpectHeaderTest.java  | 3 ---
 .../test/java/org/jclouds/http/functions/BaseHandlerTest.java | 4 ----
 .../jclouds/http/functions/ParseFirstJsonValueNamedTest.java  | 4 ----
 .../test/java/org/jclouds/http/functions/ParseSaxTest.java    | 2 --
 .../org/jclouds/http/functions/UnwrapFirstValueNamedTest.java | 4 ----
 .../org/jclouds/http/handlers/BaseHttpErrorHandlerTest.java   | 4 ----
 .../org/jclouds/http/handlers/DelegatingErrorHandlerTest.java | 4 ----
 .../jclouds/http/handlers/RedirectionRetryHandlerTest.java    | 2 --
 .../internal/TrackingJavaUrlHttpCommandExecutorService.java   | 2 --
 .../src/test/java/org/jclouds/http/internal/WireLiveTest.java | 4 ----
 core/src/test/java/org/jclouds/http/internal/WireTest.java    | 4 ----
 .../test/java/org/jclouds/http/options/GetOptionsTest.java    | 2 --
 core/src/test/java/org/jclouds/http/utils/QueriesTest.java    | 3 ---
 core/src/test/java/org/jclouds/internal/BaseViewTest.java     | 1 -
 .../internal/FilterStringsBoundToInjectorByNameTest.java      | 4 ----
 .../test/java/org/jclouds/io/payloads/MultipartFormTest.java  | 2 --
 .../test/java/org/jclouds/io/payloads/StringPayloadTest.java  | 4 ----
 core/src/test/java/org/jclouds/json/BaseItemParserTest.java   | 4 ----
 .../org/jclouds/json/BaseIterableWithMarkerParserTest.java    | 4 ----
 core/src/test/java/org/jclouds/json/BaseParserTest.java       | 4 ----
 core/src/test/java/org/jclouds/json/BaseSetParserTest.java    | 4 ----
 core/src/test/java/org/jclouds/json/GsonExperimentsTest.java  | 4 ----
 ...izationConstructorAndReflectiveTypeAdapterFactoryTest.java | 4 ----
 .../java/org/jclouds/json/internal/NamingStrategiesTest.java  | 3 ---
 .../json/internal/NullFilteringTypeAdapterFactoriesTest.java  | 4 ----
 .../jclouds/json/internal/NullHackJsonLiteralAdapterTest.java | 1 -
 .../jclouds/json/internal/OptionalTypeAdapterFactoryTest.java | 2 --
 .../org/jclouds/lifecycle/config/LifeCycleModuleTest.java     | 4 ----
 .../ProvideIso3166CodesByLocationIdViaPropertiesTest.java     | 4 ----
 .../functions/RegionToEndpointOrProviderIfNullTest.java       | 2 --
 .../org/jclouds/location/functions/RegionToEndpointTest.java  | 2 --
 .../org/jclouds/location/functions/ZoneToEndpointTest.java    | 2 --
 .../predicates/fromconfig/AnyOrConfiguredRegionIdTest.java    | 2 --
 .../predicates/fromconfig/AnyOrConfiguredZoneIdTest.java      | 2 --
 .../org/jclouds/location/suppliers/all/JustProviderTest.java  | 2 --
 .../jclouds/location/suppliers/all/RegionToProviderTest.java  | 4 ----
 .../jclouds/location/suppliers/all/ZoneToProviderTest.java    | 4 ----
 .../jclouds/location/suppliers/implicit/FirstNetworkTest.java | 3 ---
 .../jclouds/location/suppliers/implicit/FirstRegionTest.java  | 2 --
 .../jclouds/location/suppliers/implicit/FirstZoneTest.java    | 2 --
 ...lyLocationOrFirstRegionOptionallyMatchingRegionIdTest.java | 2 --
 .../suppliers/implicit/OnlyLocationOrFirstZoneTest.java       | 2 --
 core/src/test/java/org/jclouds/osgi/BundlesTest.java          | 5 -----
 .../java/org/jclouds/osgi/MetadataBundleListenerTest.java     | 5 -----
 .../providers/JcloudsTestBlobStoreProviderMetadata.java       | 2 --
 .../jclouds/providers/JcloudsTestComputeProviderMetadata.java | 2 --
 .../JcloudsTestYetAnotherComputeProviderMetadata.java         | 2 --
 core/src/test/java/org/jclouds/providers/ProvidersTest.java   | 2 --
 .../config/BindProviderMetadataContextAndCredentialsTest.java | 4 ----
 .../jclouds/providers/internal/BaseProviderMetadataTest.java  | 4 ----
 .../internal/UpdateProviderMetadataFromPropertiesTest.java    | 4 ----
 .../java/org/jclouds/reflect/FunctionalReflectionTest.java    | 4 ----
 .../org/jclouds/reflect/Reflection2CoreJavaClassesTest.java   | 2 --
 .../org/jclouds/reflect/Reflection2OverriddenMethodTest.java  | 2 --
 core/src/test/java/org/jclouds/reflect/Reflection2Test.java   | 4 ----
 .../test/java/org/jclouds/rest/CredentialStoreModuleTest.java | 4 ----
 .../org/jclouds/rest/annotationparsing/ClosableApiTest.java   | 2 --
 .../rest/annotationparsing/DelegateAnnotationExpectTest.java  | 2 --
 .../JAXBResponseParserAnnotationExpectTest.java               | 2 --
 .../rest/annotationparsing/PATCHAnnotationExpectTest.java     | 3 ---
 .../rest/annotationparsing/ProvidesAnnotationExpectTest.java  | 2 --
 .../rest/binders/BindAsHostPrefixIfConfiguredTest.java        | 2 --
 .../org/jclouds/rest/binders/BindMapToStringPayloadTest.java  | 2 --
 .../java/org/jclouds/rest/binders/BindToJsonPayloadTest.java  | 2 --
 .../rest/binders/BindToJsonPayloadWrappedWithTest.java        | 2 --
 .../org/jclouds/rest/binders/BindToStringPayloadTest.java     | 2 --
 .../java/org/jclouds/rest/binders/BindToXMLPayloadTest.java   | 2 --
 .../jclouds/rest/config/MappedHttpInvocationModuleTest.java   | 4 ----
 .../jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java | 4 ----
 ...iVersionLexicographicallyAtOrAfterSinceApiVersionTest.java | 2 --
 .../test/java/org/jclouds/rest/internal/BaseAsyncApiTest.java | 4 ----
 .../java/org/jclouds/rest/internal/BaseAsyncClientTest.java   | 4 ----
 .../org/jclouds/rest/internal/BaseHttpApiMetadataTest.java    | 4 ----
 .../java/org/jclouds/rest/internal/BaseRestApiExpectTest.java | 2 --
 .../org/jclouds/rest/internal/BaseRestApiMetadataTest.java    | 4 ----
 .../test/java/org/jclouds/rest/internal/BaseRestApiTest.java  | 4 ----
 .../java/org/jclouds/rest/internal/InvokeHttpMethodTest.java  | 4 ----
 .../org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java | 4 ----
 .../jclouds/rest/internal/RestAnnotationProcessorTest.java    | 2 --
 ...ryOnTimeOutButNotOnAuthorizationExceptionSupplierTest.java | 4 ----
 .../SetAndThrowAuthorizationExceptionSupplierTest.java        | 4 ----
 .../java/org/jclouds/test/testng/UnitTestStatusListener.java  | 3 ---
 core/src/test/java/org/jclouds/util/HttpUtilsTest.java        | 1 -
 core/src/test/java/org/jclouds/util/InetAddresses2Test.java   | 3 ---
 core/src/test/java/org/jclouds/util/Maps2Test.java            | 3 ---
 core/src/test/java/org/jclouds/util/Multimaps2Test.java       | 3 ---
 core/src/test/java/org/jclouds/util/Optionals2Test.java       | 3 ---
 core/src/test/java/org/jclouds/util/Predicates2Test.java      | 4 ----
 core/src/test/java/org/jclouds/util/Strings2Test.java         | 3 ---
 core/src/test/java/org/jclouds/util/Throwables2Test.java      | 3 ---
 core/src/test/java/org/jclouds/utils/TestUtils.java           | 3 ---
 .../http/apachehc/ApacheHCHttpCommandExecutorService.java     | 3 ---
 .../main/java/org/jclouds/http/apachehc/ApacheHCUtils.java    | 4 ----
 .../config/ApacheHCHttpCommandExecutorServiceModule.java      | 3 ---
 .../ApacheHCHttpCommandExecutorServiceTestDisabled.java       | 2 --
 .../jclouds/encryption/bouncycastle/BouncyCastleCrypto.java   | 4 ----
 .../bouncycastle/config/BouncyCastleCryptoModule.java         | 3 ---
 .../bouncycastle/BouncyCastlePasswordDecryptionTest.java      | 3 ---
 .../enterprise/config/EnterpriseConfigurationModule.java      | 3 ---
 .../org/jclouds/gae/AsyncGaeHttpCommandExecutorService.java   | 2 --
 .../src/main/java/org/jclouds/gae/ConvertToGaeRequest.java    | 4 ----
 .../main/java/org/jclouds/gae/ConvertToJcloudsResponse.java   | 4 ----
 .../java/org/jclouds/gae/GaeHttpCommandExecutorService.java   | 2 --
 .../gae/config/AsyncGoogleAppEngineConfigurationModule.java   | 2 --
 .../gae/config/CurrentRequestExecutorServiceModule.java       | 4 ----
 .../gae/config/GoogleAppEngineConfigurationModule.java        | 2 --
 .../MultithreadedAsyncGoogleAppEngineConfigurationModule.java | 2 --
 .../AsyncGaeHttpCommandExecutorServiceIntegrationTest.java    | 2 --
 .../test/java/org/jclouds/gae/ConvertToGaeRequestTest.java    | 4 ----
 .../java/org/jclouds/gae/ConvertToJcloudsResponseTest.java    | 4 ----
 .../src/main/java/org/jclouds/date/joda/JodaDateService.java  | 5 -----
 .../org/jclouds/date/joda/config/JodaDateServiceModule.java   | 3 ---
 .../test/java/org/jclouds/date/joda/JodaDateServiceTest.java  | 3 ---
 .../src/main/java/org/jclouds/ssh/jsch/JschSshClient.java     | 2 --
 .../java/org/jclouds/ssh/jsch/config/JschSshClientModule.java | 4 ----
 .../test/java/org/jclouds/ssh/jsch/JschSshClientLiveTest.java | 2 --
 .../src/test/java/org/jclouds/ssh/jsch/JschSshClientTest.java | 4 ----
 .../org/jclouds/ssh/jsch/config/JschSshClientModuleTest.java  | 2 --
 .../src/main/java/org/jclouds/logging/log4j/Log4JLogger.java  | 3 ---
 .../org/jclouds/logging/log4j/config/Log4JLoggingModule.java  | 3 ---
 .../java/org/jclouds/netty/config/NettyPayloadModule.java     | 5 -----
 .../java/org/jclouds/netty/io/ChunkedFileInputStream.java     | 7 -------
 .../main/java/org/jclouds/netty/io/NettyPayloadSlicer.java    | 4 ----
 .../org/jclouds/http/okhttp/OkHttpCommandExecutorService.java | 2 --
 .../okhttp/config/OkHttpCommandExecutorServiceModule.java     | 2 --
 .../jclouds/http/okhttp/OkHttpCommandExecutorServiceTest.java | 2 --
 .../src/main/java/org/jclouds/logging/slf4j/SLF4JLogger.java  | 3 ---
 .../org/jclouds/logging/slf4j/config/SLF4JLoggingModule.java  | 3 ---
 .../sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java    | 2 --
 .../java/org/jclouds/sshj/config/SshjSshClientModule.java     | 4 ----
 .../src/test/java/org/jclouds/sshj/SshjSshClientLiveTest.java | 2 --
 .../src/test/java/org/jclouds/sshj/SshjSshClientTest.java     | 4 ----
 .../java/org/jclouds/sshj/config/SshjSshClientModuleTest.java | 2 --
 .../java/org/jclouds/loadbalancer/LoadBalancerService.java    | 2 --
 .../org/jclouds/loadbalancer/LoadBalancerServiceAdapter.java  | 3 ---
 .../org/jclouds/loadbalancer/LoadBalancerServiceContext.java  | 4 ----
 .../config/BaseLoadBalancerServiceContextModule.java          | 4 ----
 .../config/BindLoadBalancerStrategiesByClass.java             | 5 -----
 .../org/jclouds/loadbalancer/domain/LoadBalancerMetadata.java | 1 -
 .../org/jclouds/loadbalancer/domain/LoadBalancerType.java     | 4 ----
 .../domain/internal/LoadBalancerMetadataImpl.java             | 3 ---
 .../loadbalancer/internal/BaseLoadBalancerService.java        | 5 -----
 .../loadbalancer/internal/LoadBalancerServiceContextImpl.java | 3 ---
 .../jclouds/loadbalancer/reference/LoadBalancerConstants.java | 4 ----
 .../loadbalancer/strategy/DestroyLoadBalancerStrategy.java    | 5 -----
 .../strategy/GetLoadBalancerMetadataStrategy.java             | 2 --
 .../loadbalancer/strategy/ListLoadBalancersStrategy.java      | 5 -----
 .../loadbalancer/strategy/LoadBalanceNodesStrategy.java       | 2 --
 .../jclouds/loadbalancer/BaseLoadBalancerServiceLiveTest.java | 4 ----
 .../internal/BaseLoadBalancerServiceApiMetadataTest.java      | 4 ----
 .../jclouds/aws/cloudwatch/AWSCloudWatchProviderMetadata.java | 1 -
 .../org/jclouds/aws/cloudwatch/AWSCloudWatchProviderTest.java | 2 --
 .../jclouds/aws/cloudwatch/features/AWSMetricApiLiveTest.java | 3 ---
 .../aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2Api.java  | 2 --
 .../main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java | 2 --
 .../aws/ec2/binders/BindLaunchSpecificationToFormParams.java  | 4 ----
 .../BindSpotInstanceRequestIdsToIndexedFormParams.java        | 2 --
 .../aws/ec2/binders/BindTagFiltersToIndexedFormParams.java    | 3 ---
 .../jclouds/aws/ec2/binders/BindTagsToIndexedFormParams.java  | 3 ---
 .../org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java     | 3 ---
 .../jclouds/aws/ec2/compute/AWSEC2ComputeServiceContext.java  | 3 ---
 .../jclouds/aws/ec2/compute/AWSEC2TemplateBuilderImpl.java    | 4 ----
 .../org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java    | 2 --
 .../ec2/compute/config/AWSEC2BindComputeSuppliersByClass.java | 3 ---
 .../ec2/compute/config/AWSEC2ComputeServiceContextModule.java | 4 ----
 .../config/AWSEC2ComputeServiceDependenciesModule.java        | 4 ----
 .../org/jclouds/aws/ec2/compute/config/ClusterCompute.java    | 3 ---
 .../java/org/jclouds/aws/ec2/compute/config/ImageQuery.java   | 3 ---
 .../ec2/compute/extensions/AWSEC2SecurityGroupExtension.java  | 2 --
 .../compute/functions/AWSEC2SecurityGroupToSecurityGroup.java | 2 --
 .../compute/functions/AWSRunningInstanceToNodeMetadata.java   | 3 ---
 .../compute/functions/PresentSpotRequestsAndInstances.java    | 2 --
 .../ec2/compute/internal/AWSEC2ComputeServiceContextImpl.java | 3 ---
 .../compute/loaders/AWSEC2CreateSecurityGroupIfNeeded.java    | 5 -----
 .../strategy/AWSEC2CreateNodesInGroupThenAddToSet.java        | 4 ----
 .../aws/ec2/compute/strategy/AWSEC2DestroyNodeStrategy.java   | 4 ----
 .../ec2/compute/strategy/AWSEC2GetNodeMetadataStrategy.java   | 4 ----
 .../aws/ec2/compute/strategy/AWSEC2ListNodesStrategy.java     | 4 ----
 .../aws/ec2/compute/strategy/AWSEC2ReviseParsedImage.java     | 3 ---
 ...PlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java | 4 ----
 .../aws/ec2/compute/suppliers/AWSEC2HardwareSupplier.java     | 4 ----
 .../aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java        | 4 ----
 .../org/jclouds/aws/ec2/compute/suppliers/CallForImages.java  | 4 ----
 .../java/org/jclouds/aws/ec2/config/AWSEC2HttpApiModule.java  | 2 --
 .../java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java   | 1 -
 .../java/org/jclouds/aws/ec2/domain/LaunchSpecification.java  | 1 -
 .../main/java/org/jclouds/aws/ec2/domain/MonitoringState.java | 1 -
 .../main/java/org/jclouds/aws/ec2/domain/PlacementGroup.java  | 1 -
 .../aws/ec2/domain/RegionNameAndPublicKeyMaterial.java        | 4 ----
 .../src/main/java/org/jclouds/aws/ec2/domain/Spot.java        | 1 -
 .../java/org/jclouds/aws/ec2/domain/SpotInstanceRequest.java  | 4 ----
 .../src/main/java/org/jclouds/aws/ec2/features/AWSAMIApi.java | 2 --
 .../java/org/jclouds/aws/ec2/features/AWSInstanceApi.java     | 2 --
 .../main/java/org/jclouds/aws/ec2/features/AWSKeyPairApi.java | 3 ---
 .../org/jclouds/aws/ec2/features/AWSSecurityGroupApi.java     | 2 --
 .../main/java/org/jclouds/aws/ec2/features/MonitoringApi.java | 2 --
 .../java/org/jclouds/aws/ec2/features/PlacementGroupApi.java  | 2 --
 .../java/org/jclouds/aws/ec2/features/SpotInstanceApi.java    | 2 --
 .../aws/ec2/functions/CreatePlacementGroupIfNeeded.java       | 4 ----
 .../aws/ec2/functions/ImportOrReturnExistingKeypair.java      | 4 ----
 .../functions/SpotInstanceRequestToAWSRunningInstance.java    | 3 ---
 .../org/jclouds/aws/ec2/options/AWSDescribeImagesOptions.java | 1 -
 .../org/jclouds/aws/ec2/options/AWSRunInstancesOptions.java   | 1 -
 .../jclouds/aws/ec2/options/CreateSecurityGroupOptions.java   | 1 -
 .../aws/ec2/options/DescribeSpotPriceHistoryOptions.java      | 1 -
 .../jclouds/aws/ec2/options/RequestSpotInstancesOptions.java  | 1 -
 .../jclouds/aws/ec2/predicates/PlacementGroupAvailable.java   | 5 -----
 .../org/jclouds/aws/ec2/predicates/PlacementGroupDeleted.java | 5 -----
 .../jclouds/aws/ec2/predicates/SpotInstanceRequestActive.java | 5 -----
 .../java/org/jclouds/aws/ec2/reference/AWSEC2Constants.java   | 2 --
 .../aws/ec2/xml/AWSDescribeInstancesResponseHandler.java      | 1 -
 .../ec2/xml/AWSEC2DescribeSecurityGroupsResponseHandler.java  | 1 -
 .../org/jclouds/aws/ec2/xml/AWSEC2IpPermissionHandler.java    | 4 ----
 .../org/jclouds/aws/ec2/xml/AWSEC2SecurityGroupHandler.java   | 3 ---
 .../jclouds/aws/ec2/xml/AWSRunInstancesResponseHandler.java   | 1 -
 .../org/jclouds/aws/ec2/xml/BaseAWSReservationHandler.java    | 4 ----
 .../aws/ec2/xml/CreateSecurityGroupResponseHandler.java       | 4 ----
 .../aws/ec2/xml/DescribePlacementGroupsResponseHandler.java   | 3 ---
 .../xml/DescribeReservedInstancesOfferingResponseHandler.java | 3 ---
 .../aws/ec2/xml/DescribeSpotPriceHistoryResponseHandler.java  | 3 ---
 .../org/jclouds/aws/ec2/xml/LaunchSpecificationHandler.java   | 4 ----
 .../java/org/jclouds/aws/ec2/xml/MonitoringStateHandler.java  | 4 ----
 .../java/org/jclouds/aws/ec2/xml/PlacementGroupHandler.java   | 4 ----
 .../java/org/jclouds/aws/ec2/xml/ProductCodesHandler.java     | 1 -
 .../jclouds/aws/ec2/xml/ReservedInstancesOfferingHandler.java | 1 -
 .../src/main/java/org/jclouds/aws/ec2/xml/SpotHandler.java    | 4 ----
 .../java/org/jclouds/aws/ec2/xml/SpotInstanceHandler.java     | 4 ----
 .../java/org/jclouds/aws/ec2/xml/SpotInstancesHandler.java    | 3 ---
 .../java/org/jclouds/aws/ec2/AWSEC2ContextBuilderTest.java    | 3 ---
 .../src/test/java/org/jclouds/aws/ec2/AWSEC2ProviderTest.java | 2 --
 .../ec2/binders/BindLaunchSpecificationToFormParamsTest.java  | 3 ---
 .../aws/ec2/binders/BindTagsToIndexedFormParamsTest.java      | 2 --
 .../aws/ec2/compute/AWSEC2ComputeServiceExpectTest.java       | 2 --
 .../jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java | 4 ----
 .../aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java        | 4 ----
 .../compute/config/AWSEC2ComputeServiceContextModuleTest.java | 3 ---
 .../ec2/compute/extensions/AWSEC2ImageExtensionLiveTest.java  | 3 ---
 .../extensions/AWSEC2SecurityGroupExtensionExpectTest.java    | 4 ----
 .../extensions/AWSEC2SecurityGroupExtensionLiveTest.java      | 3 ---
 .../functions/AWSEC2SecurityGroupToSecurityGroupTest.java     | 3 ---
 .../functions/AWSRunningInstanceToNodeMetadataTest.java       | 3 ---
 .../functions/PresentSpotRequestsAndInstancesTest.java        | 3 ---
 .../compute/internal/BaseAWSEC2ComputeServiceExpectTest.java  | 2 --
 .../loaders/AWSEC2CreateSecurityGroupIfNeededTest.java        | 4 ----
 .../aws/ec2/compute/options/AWSEC2TemplateOptionsTest.java    | 2 --
 .../aws/ec2/compute/strategy/AWSEC2ImageParserTest.java       | 3 ---
 ...ementAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java | 3 ---
 .../java/org/jclouds/aws/ec2/features/AWSAMIApiLiveTest.java  | 2 --
 .../test/java/org/jclouds/aws/ec2/features/AWSAMIApiTest.java | 2 --
 .../org/jclouds/aws/ec2/features/AWSInstanceApiLiveTest.java  | 2 --
 .../java/org/jclouds/aws/ec2/features/AWSInstanceApiTest.java | 2 --
 .../org/jclouds/aws/ec2/features/AWSKeyPairApiLiveTest.java   | 2 --
 .../java/org/jclouds/aws/ec2/features/AWSKeyPairApiTest.java  | 2 --
 .../jclouds/aws/ec2/features/AWSSecurityGroupApiLiveTest.java | 4 ----
 .../org/jclouds/aws/ec2/features/AWSSecurityGroupApiTest.java | 2 --
 .../org/jclouds/aws/ec2/features/AWSSubnetApiLiveTest.java    | 4 ----
 .../java/org/jclouds/aws/ec2/features/BaseAWSEC2ApiTest.java  | 3 ---
 .../org/jclouds/aws/ec2/features/MonitoringApiLiveTest.java   | 2 --
 .../java/org/jclouds/aws/ec2/features/MonitoringApiTest.java  | 2 --
 .../jclouds/aws/ec2/features/PlacementGroupApiExpectTest.java | 3 ---
 .../jclouds/aws/ec2/features/PlacementGroupApiLiveTest.java   | 2 --
 .../org/jclouds/aws/ec2/features/PlacementGroupApiTest.java   | 2 --
 .../jclouds/aws/ec2/features/SpotInstanceApiExpectTest.java   | 3 ---
 .../org/jclouds/aws/ec2/features/SpotInstanceApiLiveTest.java | 2 --
 .../org/jclouds/aws/ec2/features/SpotInstanceApiTest.java     | 2 --
 .../jclouds/aws/ec2/features/TagSecurityGroupLiveTest.java    | 4 ----
 .../aws/ec2/functions/ImportOrReturnExistingKeypairTest.java  | 3 ---
 .../SpotInstanceRequestToAWSRunningInstanceTest.java          | 2 --
 .../jclouds/aws/ec2/options/AWSDescribeImagesOptionsTest.java | 2 --
 .../jclouds/aws/ec2/options/AWSRunInstancesOptionsTest.java   | 2 --
 .../aws/ec2/options/DescribeSpotPriceHistoryOptionsTest.java  | 2 --
 .../aws/ec2/options/RequestSpotInstancesOptionsTest.java      | 2 --
 .../jclouds/aws/ec2/parse/DescribeInstancesResponseTest.java  | 2 --
 .../aws/ec2/parse/DescribeSecurityGroupsResponseTest.java     | 4 ----
 .../aws/ec2/xml/AWSDescribeInstancesResponseHandlerTest.java  | 2 --
 .../aws/ec2/xml/AWSRunInstancesResponseHandlerTest.java       | 2 --
 .../ec2/xml/DescribePlacementGroupsResponseHandlerTest.java   | 2 --
 .../DescribeReservedInstancesOfferingResponseHandlerTest.java | 2 --
 .../ec2/xml/DescribeSpotPriceHistoryResponseHandlerTest.java  | 2 --
 .../org/jclouds/aws/ec2/xml/MonitoringStateHandlerTest.java   | 2 --
 .../java/org/jclouds/aws/ec2/xml/ProductCodesHandlerTest.java | 2 --
 .../java/org/jclouds/aws/ec2/xml/SpotInstanceHandlerTest.java | 2 --
 .../org/jclouds/aws/ec2/xml/SpotInstancesHandlerTest.java     | 2 --
 .../org/jclouds/aws/route53/AWSRoute53ProviderMetadata.java   | 1 -
 .../java/org/jclouds/aws/route53/AWSRoute53ApiLiveTest.java   | 2 --
 .../java/org/jclouds/aws/route53/AWSRoute53ProviderTest.java  | 2 --
 .../aws/route53/features/AWSHostedZoneApiLiveTest.java        | 3 ---
 .../aws/route53/features/AWSResourceRecordSetApiLiveTest.java | 3 ---
 .../src/main/java/org/jclouds/aws/s3/AWSS3ApiMetadata.java    | 2 --
 .../src/main/java/org/jclouds/aws/s3/AWSS3AsyncClient.java    | 1 -
 .../aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3Client.java  | 1 -
 .../main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java   | 2 --
 .../aws/s3/binders/BindIterableAsPayloadToDeleteRequest.java  | 3 ---
 .../jclouds/aws/s3/binders/BindObjectMetadataToRequest.java   | 4 ----
 .../jclouds/aws/s3/binders/BindPartIdsAndETagsToRequest.java  | 4 ----
 .../org/jclouds/aws/s3/blobstore/AWSS3AsyncBlobStore.java     | 1 -
 .../org/jclouds/aws/s3/blobstore/AWSS3BlobRequestSigner.java  | 3 ---
 .../java/org/jclouds/aws/s3/blobstore/AWSS3BlobStore.java     | 2 --
 .../org/jclouds/aws/s3/blobstore/AWSS3BlobStoreContext.java   | 3 ---
 .../aws/s3/blobstore/config/AWSS3BlobStoreContextModule.java  | 5 -----
 .../aws/s3/blobstore/internal/AWSS3BlobStoreContextImpl.java  | 3 ---
 .../aws/s3/blobstore/options/AWSS3PutObjectOptions.java       | 1 -
 .../org/jclouds/aws/s3/blobstore/options/AWSS3PutOptions.java | 2 --
 .../s3/blobstore/strategy/AsyncMultipartUploadStrategy.java   | 2 --
 .../jclouds/aws/s3/blobstore/strategy/MultipartUpload.java    | 2 --
 .../aws/s3/blobstore/strategy/MultipartUploadStrategy.java    | 2 --
 .../strategy/internal/MultipartUploadSlicingAlgorithm.java    | 1 -
 .../strategy/internal/SequentialMultipartUploadStrategy.java  | 2 --
 .../java/org/jclouds/aws/s3/config/AWSS3RestClientModule.java | 2 --
 .../src/main/java/org/jclouds/aws/s3/domain/DeleteResult.java | 1 -
 .../jclouds/aws/s3/filters/AWSRequestAuthorizeSignature.java  | 1 -
 .../main/java/org/jclouds/aws/s3/filters/package-info.java    | 1 -
 .../aws/s3/functions/ETagFromHttpResponseViaRegex.java        | 1 -
 .../java/org/jclouds/aws/s3/functions/ObjectMetadataKey.java  | 4 ----
 .../aws/s3/functions/UploadIdFromHttpResponseViaRegex.java    | 1 -
 .../s3/predicates/validators/AWSS3BucketNameValidator.java    | 2 --
 .../main/java/org/jclouds/aws/s3/xml/DeleteResultHandler.java | 3 ---
 .../main/java/org/jclouds/aws/s3/xml/ErrorEntryHandler.java   | 3 ---
 .../test/java/org/jclouds/aws/s3/AWSS3AsyncClientTest.java    | 3 ---
 .../test/java/org/jclouds/aws/s3/AWSS3ClientExpectTest.java   | 3 ---
 .../src/test/java/org/jclouds/aws/s3/AWSS3ClientLiveTest.java | 2 --
 .../src/test/java/org/jclouds/aws/s3/AWSS3ProviderTest.java   | 2 --
 .../s3/binders/BindIterableAsPayloadToDeleteRequestTest.java  | 3 ---
 .../aws/s3/binders/BindObjectMetadataToRequestTest.java       | 2 --
 .../aws/s3/binders/BindPartIdsAndETagsToRequestTest.java      | 2 --
 .../jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java   | 3 ---
 .../blobstore/integration/AWSS3BlobIntegrationLiveTest.java   | 3 ---
 .../aws/s3/blobstore/integration/AWSS3BlobLiveTest.java       | 3 ---
 .../aws/s3/blobstore/integration/AWSS3BlobSignerLiveTest.java | 4 ----
 .../integration/AWSS3ContainerIntegrationLiveTest.java        | 3 ---
 .../aws/s3/blobstore/integration/AWSS3ContainerLiveTest.java  | 3 ---
 .../integration/AWSS3ServiceIntegrationLiveTest.java          | 3 ---
 .../s3/blobstore/integration/PathBasedContainerLiveTest.java  | 3 ---
 .../aws/s3/blobstore/strategy/internal/MpuGraphData.java      | 2 --
 .../strategy/internal/MpuPartitioningAlgorithmTest.java       | 2 --
 .../internal/SequentialMultipartUploadStrategyMockTest.java   | 4 ----
 .../aws/s3/functions/ETagFromHttpResponseViaRegexTest.java    | 2 --
 .../s3/functions/UploadIdFromHttpResponseViaRegexTest.java    | 2 --
 .../jclouds/aws/s3/internal/BaseAWSS3ClientExpectTest.java    | 2 --
 .../java/org/jclouds/aws/s3/services/AWSBucketsLiveTest.java  | 3 ---
 .../java/org/jclouds/aws/s3/xml/DeleteResultHandlerTest.java  | 3 ---
 .../main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java | 2 --
 .../src/test/java/org/jclouds/aws/sqs/AWSSQSProviderTest.java | 2 --
 .../org/jclouds/aws/sqs/features/AWSMessageApiLiveTest.java   | 4 ----
 .../jclouds/aws/sqs/features/AWSPermissionApiLiveTest.java    | 4 ----
 .../org/jclouds/aws/sqs/features/AWSQueueApiLiveTest.java     | 4 ----
 .../main/java/org/jclouds/aws/sts/AWSSTSProviderMetadata.java | 1 -
 .../src/test/java/org/jclouds/aws/sts/AWSSTSApiLiveTest.java  | 2 --
 .../src/test/java/org/jclouds/aws/sts/AWSSTSProviderTest.java | 2 --
 .../main/java/org/jclouds/azureblob/AzureBlobApiMetadata.java | 2 --
 .../main/java/org/jclouds/azureblob/AzureBlobAsyncClient.java | 1 -
 .../src/main/java/org/jclouds/azureblob/AzureBlobClient.java  | 1 -
 .../main/java/org/jclouds/azureblob/AzureBlobFallbacks.java   | 4 ----
 .../java/org/jclouds/azureblob/AzureBlobProviderMetadata.java | 2 --
 .../org/jclouds/azureblob/blobstore/AzureAsyncBlobStore.java  | 1 -
 .../jclouds/azureblob/blobstore/AzureBlobRequestSigner.java   | 4 ----
 .../java/org/jclouds/azureblob/blobstore/AzureBlobStore.java  | 3 ---
 .../blobstore/config/AzureBlobStoreContextModule.java         | 2 --
 .../azureblob/blobstore/functions/AzureBlobToBlob.java        | 3 ---
 .../blobstore/functions/BlobMetadataToBlobProperties.java     | 3 ---
 .../blobstore/functions/BlobPropertiesToBlobMetadata.java     | 3 ---
 .../azureblob/blobstore/functions/BlobToAzureBlob.java        | 3 ---
 .../blobstore/functions/ContainerToResourceMetadata.java      | 3 ---
 .../blobstore/functions/ListBlobsResponseToResourceList.java  | 3 ---
 .../blobstore/functions/ListOptionsToListBlobsOptions.java    | 3 ---
 .../azureblob/blobstore/strategy/MultipartUploadStrategy.java | 2 --
 .../java/org/jclouds/azureblob/config/AzureBlobModule.java    | 2 --
 .../jclouds/azureblob/config/AzureBlobRestClientModule.java   | 2 --
 .../src/main/java/org/jclouds/azureblob/domain/AzureBlob.java | 1 -
 .../org/jclouds/azureblob/domain/BlobBlockProperties.java     | 2 --
 .../java/org/jclouds/azureblob/domain/BlobProperties.java     | 5 -----
 .../src/main/java/org/jclouds/azureblob/domain/BlobType.java  | 3 ---
 .../org/jclouds/azureblob/domain/ContainerProperties.java     | 5 -----
 .../main/java/org/jclouds/azureblob/domain/LeaseStatus.java   | 3 ---
 .../org/jclouds/azureblob/domain/ListBlobBlocksResponse.java  | 2 --
 .../java/org/jclouds/azureblob/domain/ListBlobsResponse.java  | 4 ----
 .../org/jclouds/azureblob/domain/MutableBlobProperties.java   | 5 -----
 .../domain/MutableContainerPropertiesWithMetadata.java        | 5 -----
 .../main/java/org/jclouds/azureblob/domain/PublicAccess.java  | 1 -
 .../org/jclouds/azureblob/domain/internal/AzureBlobImpl.java  | 2 --
 .../jclouds/azureblob/domain/internal/BlobPropertiesImpl.java | 2 --
 .../azureblob/domain/internal/ContainerPropertiesImpl.java    | 2 --
 .../azureblob/domain/internal/HashSetListBlobsResponse.java   | 5 -----
 .../azureblob/domain/internal/MutableBlobPropertiesImpl.java  | 2 --
 .../internal/MutableContainerPropertiesWithMetadataImpl.java  | 2 --
 .../main/java/org/jclouds/azureblob/functions/BlobName.java   | 4 ----
 .../functions/ParseBlobFromHeadersAndHttpContent.java         | 1 -
 .../azureblob/functions/ParseBlobPropertiesFromHeaders.java   | 3 ---
 .../functions/ParseContainerPropertiesFromHeaders.java        | 3 ---
 .../jclouds/azureblob/functions/ParsePublicAccessHeader.java  | 4 ----
 .../azureblob/handlers/ParseAzureBlobErrorFromXmlContent.java | 4 ----
 .../org/jclouds/azureblob/options/CreateContainerOptions.java | 1 -
 .../java/org/jclouds/azureblob/options/ListBlobsOptions.java  | 1 -
 .../predicates/validators/ContainerNameValidator.java         | 2 --
 .../azureblob/xml/AccountNameEnumerationResultsHandler.java   | 1 -
 .../azureblob/xml/ContainerNameEnumerationResultsHandler.java | 1 -
 .../handlers/ParseAzureBlobErrorFromXmlContentTest.java       | 4 ----
 .../java/org/jclouds/azureblob/AzureBlobAsyncClientTest.java  | 2 --
 .../java/org/jclouds/azureblob/AzureBlobClientLiveTest.java   | 2 --
 .../java/org/jclouds/azureblob/AzureBlobProviderTest.java     | 4 ----
 .../azureblob/binders/BindAzureBlobMetadataToRequestTest.java | 2 --
 .../azureblob/blobstore/AzureBlobRequestSignerTest.java       | 2 --
 .../blobstore/functions/ListBlobsOptionsToListOptions.java    | 3 ---
 .../blobstore/functions/ResourceToListBlobsResponse.java      | 3 ---
 .../integration/AzureBlobContainerIntegrationLiveTest.java    | 4 ----
 .../blobstore/integration/AzureBlobContainerLiveTest.java     | 3 ---
 .../blobstore/integration/AzureBlobIntegrationLiveTest.java   | 4 ----
 .../azureblob/blobstore/integration/AzureBlobLiveTest.java    | 4 ----
 .../integration/AzureBlobServiceIntegrationLiveTest.java      | 3 ---
 .../blobstore/integration/AzureBlobSignerLiveTest.java        | 4 ----
 .../jclouds/azureblob/options/CreateContainerOptionsTest.java | 2 --
 .../org/jclouds/azureblob/options/ListBlobsOptionsTest.java   | 2 --
 .../xml/AccountNameEnumerationResultsHandlerTest.java         | 2 --
 .../xml/ContainerNameEnumerationResultsHandlerTest.java       | 2 --
 .../vcloud/zone01/BluelockVCloudZone01ProviderMetadata.java   | 2 --
 .../vcloud/zone01/BluelockVCloudZone01ProviderTest.java       | 4 ----
 .../compute/BluelockVCloudZone01ComputeServiceLiveTest.java   | 5 -----
 .../compute/BluelockVCloudZone01TemplateBuilderLiveTest.java  | 4 ----
 .../features/BluelockVCloudZone01CatalogApiLiveTest.java      | 5 -----
 .../features/BluelockVCloudZone01NetworkApiLiveTest.java      | 5 -----
 .../zone01/features/BluelockVCloudZone01OrgApiLiveTest.java   | 5 -----
 .../zone01/features/BluelockVCloudZone01TaskApiLiveTest.java  | 5 -----
 .../zone01/features/BluelockVCloudZone01VAppApiLiveTest.java  | 5 -----
 .../features/BluelockVCloudZone01VAppTemplateApiLiveTest.java | 5 -----
 .../zone01/features/BluelockVCloudZone01VDCApiLiveTest.java   | 5 -----
 .../zone01/features/BluelockVCloudZone01VmApiLiveTest.java    | 5 -----
 .../rackspace/cloudfiles/CloudFilesUKProviderMetadata.java    | 2 --
 .../rackspace/cloudfiles/CloudFilesUKClientLiveTest.java      | 2 --
 .../rackspace/cloudfiles/CloudFilesUKProviderTest.java        | 4 ----
 .../integration/CloudFilesUKBlobIntegrationLiveTest.java      | 3 ---
 .../blobstore/integration/CloudFilesUKBlobLiveTest.java       | 3 ---
 .../blobstore/integration/CloudFilesUKBlobSignerLiveTest.java | 4 ----
 .../integration/CloudFilesUKContainerIntegrationLiveTest.java | 3 ---
 .../blobstore/integration/CloudFilesUKContainerLiveTest.java  | 3 ---
 .../integration/CloudFilesUKServiceIntegrationLiveTest.java   | 3 ---
 .../rackspace/cloudfiles/CloudFilesUSProviderMetadata.java    | 2 --
 .../rackspace/cloudfiles/CloudFilesUSClientLiveTest.java      | 2 --
 .../rackspace/cloudfiles/CloudFilesUSProviderTest.java        | 4 ----
 .../integration/CloudFilesUSBlobIntegrationLiveTest.java      | 3 ---
 .../blobstore/integration/CloudFilesUSBlobLiveTest.java       | 3 ---
 .../blobstore/integration/CloudFilesUSBlobSignerLiveTest.java | 4 ----
 .../integration/CloudFilesUSContainerIntegrationLiveTest.java | 3 ---
 .../blobstore/integration/CloudFilesUSContainerLiveTest.java  | 3 ---
 .../integration/CloudFilesUSServiceIntegrationLiveTest.java   | 3 ---
 .../cloudonestorage/CloudOneStorageProviderMetadata.java      | 2 --
 .../cloudonestorage/CloudOneStorageAsyncClientTest.java       | 3 ---
 .../cloudonestorage/CloudOneStorageClientLiveTest.java        | 2 --
 .../jclouds/cloudonestorage/CloudOneStorageProviderTest.java  | 2 --
 .../integration/CloudOneStorageBlobIntegrationLiveTest.java   | 3 ---
 .../blobstore/integration/CloudOneStorageBlobLiveTest.java    | 3 ---
 .../integration/CloudOneStorageBlobSignerLiveTest.java        | 4 ----
 .../CloudOneStorageContainerIntegrationLiveTest.java          | 3 ---
 .../integration/CloudOneStorageContainerLiveTest.java         | 3 ---
 .../CloudOneStorageServiceIntegrationLiveTest.java            | 3 ---
 .../cloudservers/CloudServersUKProviderMetadata.java          | 2 --
 .../rackspace/cloudservers/CloudServersUKClientLiveTest.java  | 4 ----
 .../rackspace/cloudservers/CloudServersUKProviderTest.java    | 4 ----
 .../compute/CloudServersUKComputeServiceLiveTest.java         | 4 ----
 .../compute/CloudServersUKTemplateBuilderLiveTest.java        | 4 ----
 .../cloudservers/CloudServersUSProviderMetadata.java          | 2 --
 .../rackspace/cloudservers/CloudServersUSClientLiveTest.java  | 4 ----
 .../rackspace/cloudservers/CloudServersUSProviderTest.java    | 4 ----
 .../compute/CloudServersUSComputeServiceLiveTest.java         | 4 ----
 .../compute/CloudServersUSTemplateBuilderLiveTest.java        | 4 ----
 .../cloudsigma/CloudSigmaLasVegasProviderMetadata.java        | 2 --
 .../cloudsigma/CloudSigmaLasVegasLondonClientLiveTest.java    | 4 ----
 .../jclouds/cloudsigma/CloudSigmaLasVegasProviderTest.java    | 4 ----
 .../compute/CloudSigmaLasVegasComputeServiceLiveTest.java     | 4 ----
 .../compute/CloudSigmaLasVegasTemplateBuilderLiveTest.java    | 4 ----
 .../jclouds/cloudsigma/CloudSigmaZurichProviderMetadata.java  | 2 --
 .../jclouds/cloudsigma/CloudSigmaZurichClientLiveTest.java    | 4 ----
 .../org/jclouds/cloudsigma/CloudSigmaZurichProviderTest.java  | 4 ----
 .../compute/CloudSigmaZurichComputeServiceLiveTest.java       | 4 ----
 .../compute/CloudSigmaZurichTemplateBuilderLiveTest.java      | 4 ----
 .../dynect/src/main/java/org/jclouds/dynect/v3/DynECTApi.java | 1 -
 .../main/java/org/jclouds/dynect/v3/DynECTApiMetadata.java    | 2 --
 .../src/main/java/org/jclouds/dynect/v3/DynECTExceptions.java | 2 --
 .../src/main/java/org/jclouds/dynect/v3/DynECTFallbacks.java  | 4 ----
 .../java/org/jclouds/dynect/v3/DynECTProviderMetadata.java    | 1 -
 .../org/jclouds/dynect/v3/config/DynECTHttpApiModule.java     | 2 --
 .../java/org/jclouds/dynect/v3/config/DynECTParserModule.java | 3 ---
 .../java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java  | 3 ---
 .../main/java/org/jclouds/dynect/v3/domain/CreateRecord.java  | 3 ---
 .../java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java     | 3 ---
 .../main/java/org/jclouds/dynect/v3/domain/GeoService.java    | 3 ---
 .../src/main/java/org/jclouds/dynect/v3/domain/Job.java       | 3 ---
 .../src/main/java/org/jclouds/dynect/v3/domain/Record.java    | 3 ---
 .../src/main/java/org/jclouds/dynect/v3/domain/RecordId.java  | 3 ---
 .../src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java | 2 --
 .../src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java | 2 --
 .../src/main/java/org/jclouds/dynect/v3/domain/Session.java   | 3 ---
 .../java/org/jclouds/dynect/v3/domain/SessionCredentials.java | 2 --
 .../src/main/java/org/jclouds/dynect/v3/domain/Zone.java      | 3 ---
 .../org/jclouds/dynect/v3/features/GeoRegionGroupApi.java     | 1 -
 .../java/org/jclouds/dynect/v3/features/GeoServiceApi.java    | 1 -
 .../main/java/org/jclouds/dynect/v3/features/RecordApi.java   | 3 ---
 .../main/java/org/jclouds/dynect/v3/features/SessionApi.java  | 1 -
 .../src/main/java/org/jclouds/dynect/v3/features/ZoneApi.java | 3 ---
 .../org/jclouds/dynect/v3/filters/AlwaysAddContentType.java   | 2 --
 .../java/org/jclouds/dynect/v3/filters/SessionManager.java    | 3 ---
 .../jclouds/dynect/v3/functions/ExtractLastPathComponent.java | 3 ---
 .../java/org/jclouds/dynect/v3/functions/ToRecordIds.java     | 3 ---
 .../org/jclouds/dynect/v3/handlers/DynECTErrorHandler.java    | 3 ---
 .../dynect/v3/handlers/GetJobRedirectionRetryHandler.java     | 2 --
 .../org/jclouds/dynect/v3/predicates/RecordPredicates.java    | 2 --
 .../org/jclouds/dynect/v3/DynECTProviderMetadataTest.java     | 4 ----
 .../test/java/org/jclouds/dynect/v3/DynectApiMockTest.java    | 4 ----
 .../dynect/v3/features/GeoRegionGroupApiExpectTest.java       | 3 ---
 .../jclouds/dynect/v3/features/GeoRegionGroupApiLiveTest.java | 3 ---
 .../jclouds/dynect/v3/features/GeoServiceApiExpectTest.java   | 3 ---
 .../org/jclouds/dynect/v3/features/GeoServiceApiLiveTest.java | 3 ---
 .../org/jclouds/dynect/v3/features/RecordApiExpectTest.java   | 3 ---
 .../org/jclouds/dynect/v3/features/RecordApiLiveTest.java     | 3 ---
 .../org/jclouds/dynect/v3/features/SessionApiExpectTest.java  | 3 ---
 .../org/jclouds/dynect/v3/features/SessionApiLiveTest.java    | 3 ---
 .../org/jclouds/dynect/v3/features/ZoneApiExpectTest.java     | 3 ---
 .../java/org/jclouds/dynect/v3/features/ZoneApiLiveTest.java  | 3 ---
 .../org/jclouds/dynect/v3/filters/SessionManagerTest.java     | 3 ---
 .../dynect/v3/functions/ExtractLastPathComponentTest.java     | 3 ---
 .../java/org/jclouds/dynect/v3/functions/ToRecordIdsTest.java | 3 ---
 .../v3/handlers/GetJobRedirectionRetryHandlerExpectTest.java  | 4 ----
 .../jclouds/dynect/v3/internal/BaseDynECTApiExpectTest.java   | 2 --
 .../org/jclouds/dynect/v3/internal/BaseDynECTExpectTest.java  | 2 --
 .../org/jclouds/dynect/v3/internal/BaseDynECTParseTest.java   | 3 ---
 .../jclouds/dynect/v3/parse/CreateSessionResponseTest.java    | 3 ---
 .../dynect/v3/parse/DeleteZoneChangesResponseTest.java        | 3 ---
 .../org/jclouds/dynect/v3/parse/DeleteZoneResponseTest.java   | 3 ---
 .../jclouds/dynect/v3/parse/GetAAAARecordResponseTest.java    | 3 ---
 .../org/jclouds/dynect/v3/parse/GetARecordResponseTest.java   | 3 ---
 .../jclouds/dynect/v3/parse/GetCNAMERecordResponseTest.java   | 3 ---
 .../dynect/v3/parse/GetGeoRegionGroupResponseTest.java        | 3 ---
 .../jclouds/dynect/v3/parse/GetGeoServiceResponseTest.java    | 3 ---
 .../org/jclouds/dynect/v3/parse/GetMXRecordResponseTest.java  | 3 ---
 .../org/jclouds/dynect/v3/parse/GetNSRecordResponseTest.java  | 3 ---
 .../org/jclouds/dynect/v3/parse/GetPTRRecordResponseTest.java | 3 ---
 .../org/jclouds/dynect/v3/parse/GetRecordResponseTest.java    | 3 ---
 .../org/jclouds/dynect/v3/parse/GetSOARecordResponseTest.java | 3 ---
 .../org/jclouds/dynect/v3/parse/GetSPFRecordResponseTest.java | 3 ---
 .../org/jclouds/dynect/v3/parse/GetSRVRecordResponseTest.java | 3 ---
 .../jclouds/dynect/v3/parse/GetSSHFPRecordResponseTest.java   | 3 ---
 .../org/jclouds/dynect/v3/parse/GetTXTRecordResponseTest.java | 3 ---
 .../java/org/jclouds/dynect/v3/parse/GetZoneResponseTest.java | 3 ---
 .../dynect/v3/parse/ListGeoRegionGroupsResponseTest.java      | 3 ---
 .../jclouds/dynect/v3/parse/ListGeoServicesResponseTest.java  | 3 ---
 .../org/jclouds/dynect/v3/parse/ListRecordsResponseTest.java  | 3 ---
 .../org/jclouds/dynect/v3/parse/ListZonesResponseTest.java    | 3 ---
 .../jclouds/dynect/v3/predicates/RecordPredicatesTest.java    | 4 ----
 .../jclouds/elastichosts/ElasticHostsAmsterdamMetadata.java   | 2 --
 .../elastichosts/ElasticHostsAmsterdamApiLiveTest.java        | 3 ---
 .../elastichosts/ElasticHostsAmsterdamProviderTest.java       | 3 ---
 .../compute/ElasticHostsAmsterdamComputeServiceLiveTest.java  | 3 ---
 .../compute/ElasticHostsAmsterdamTemplateBuilderLiveTest.java | 3 ---
 .../elastichosts/ElasticHostsHongKongProviderMetadata.java    | 2 --
 .../jclouds/elastichosts/ElasticHostsHongKongApiLiveTest.java | 3 ---
 .../elastichosts/ElasticHostsHongKongProviderTest.java        | 3 ---
 .../compute/ElasticHostsHongKongComputeServiceLiveTest.java   | 3 ---
 .../compute/ElasticHostsHongKongTemplateBuilderLiveTest.java  | 3 ---
 .../ElasticHostsPeer1LosAngelesProviderMetadata.java          | 2 --
 .../elastichosts/ElasticHostsPeer1LosAngelesApiLiveTest.java  | 4 ----
 .../elastichosts/ElasticHostsPeer1LosAngelesProviderTest.java | 4 ----
 .../ElasticHostsPeer1LosAngelesComputeServiceLiveTest.java    | 4 ----
 .../ElasticHostsPeer1LosAngelesTemplateBuilderLiveTest.java   | 4 ----
 .../ElasticHostsBlueSquareLondonProviderMetadata.java         | 2 --
 .../elastichosts/ElasticHostsBlueSquareLondonApiLiveTest.java | 4 ----
 .../ElasticHostsBlueSquareLondonProviderTest.java             | 4 ----
 .../ElasticHostsBlueSquareLondonComputeServiceLiveTest.java   | 4 ----
 .../ElasticHostsBlueSquareLondonTemplateBuilderLiveTest.java  | 3 ---
 .../elastichosts/ElasticHostsPeer1LondonProviderMetadata.java | 2 --
 .../elastichosts/ElasticHostsPeer1LondonApiLiveTest.java      | 4 ----
 .../elastichosts/ElasticHostsPeer1LondonProviderTest.java     | 4 ----
 .../ElasticHostsPeer1LondonComputeServiceLiveTest.java        | 4 ----
 .../ElasticHostsPeer1LondonTemplateBuilderLiveTest.java       | 4 ----
 .../ElasticHostsPeer1SanAntonioProviderMetadata.java          | 2 --
 .../elastichosts/ElasticHostsPeer1SanAntonioApiLiveTest.java  | 4 ----
 .../elastichosts/ElasticHostsPeer1SanAntonioProviderTest.java | 4 ----
 .../ElasticHostsPeer1SanAntonioComputeServiceLiveTest.java    | 4 ----
 .../ElasticHostsPeer1SanAntonioTemplateBuilderLiveTest.java   | 4 ----
 .../elastichosts/ElasticHostsSanJoseProviderMetadata.java     | 2 --
 .../jclouds/elastichosts/ElasticHostsSanJoseApiLiveTest.java  | 3 ---
 .../jclouds/elastichosts/ElasticHostsSanJoseProviderTest.java | 3 ---
 .../compute/ElasticHostsSanJoseComputeServiceLiveTest.java    | 3 ---
 .../compute/ElasticHostsSanJoseTemplateBuilderLiveTest.java   | 3 ---
 .../elastichosts/ElasticHostsSydneyProviderMetadata.java      | 2 --
 .../jclouds/elastichosts/ElasticHostsSydneyApiLiveTest.java   | 3 ---
 .../jclouds/elastichosts/ElasticHostsSydneyProviderTest.java  | 3 ---
 .../compute/ElasticHostsSydneyComputeServiceLiveTest.java     | 3 ---
 .../compute/ElasticHostsSydneyTemplateBuilderLiveTest.java    | 3 ---
 .../ElasticHostsPeer1TorontoProviderMetadata.java             | 2 --
 .../elastichosts/ElasticHostsPeer1TorontoApiLiveTest.java     | 4 ----
 .../elastichosts/ElasticHostsPeer1TorontoProviderTest.java    | 4 ----
 .../ElasticHostsPeer1TorontoComputeServiceLiveTest.java       | 4 ----
 .../ElasticHostsPeer1TorontoTemplateBuilderLiveTest.java      | 4 ----
 .../glesys/src/main/java/org/jclouds/glesys/GleSYSApi.java    | 1 -
 .../src/main/java/org/jclouds/glesys/GleSYSApiMetadata.java   | 2 --
 .../main/java/org/jclouds/glesys/GleSYSProviderMetadata.java  | 1 -
 .../jclouds/glesys/compute/GleSYSComputeServiceAdapter.java   | 1 -
 .../compute/config/GleSYSComputeServiceContextModule.java     | 4 ----
 .../jclouds/glesys/compute/functions/OSTemplateToImage.java   | 3 ---
 .../functions/ParseOsFamilyVersion64BitFromImageName.java     | 3 ---
 .../glesys/compute/functions/ServerDetailsToNodeMetadata.java | 3 ---
 .../glesys/compute/functions/ServerSpecToHardware.java        | 4 ----
 .../jclouds/glesys/compute/options/GleSYSTemplateOptions.java | 2 --
 .../java/org/jclouds/glesys/config/GleSYSHttpApiModule.java   | 2 --
 .../java/org/jclouds/glesys/config/GleSYSParserModule.java    | 4 ----
 .../main/java/org/jclouds/glesys/domain/AllowedArguments.java | 1 -
 .../glesys/domain/AllowedArgumentsForCreateServer.java        | 1 -
 .../src/main/java/org/jclouds/glesys/domain/Archive.java      | 1 -
 .../org/jclouds/glesys/domain/ArchiveAllowedArguments.java    | 1 -
 .../src/main/java/org/jclouds/glesys/domain/Console.java      | 1 -
 .../glesys/src/main/java/org/jclouds/glesys/domain/Cost.java  | 1 -
 .../src/main/java/org/jclouds/glesys/domain/Domain.java       | 1 -
 .../src/main/java/org/jclouds/glesys/domain/DomainRecord.java | 1 -
 .../src/main/java/org/jclouds/glesys/domain/EmailAccount.java | 1 -
 .../src/main/java/org/jclouds/glesys/domain/EmailAlias.java   | 1 -
 .../main/java/org/jclouds/glesys/domain/EmailOverview.java    | 1 -
 .../java/org/jclouds/glesys/domain/EmailOverviewDomain.java   | 1 -
 .../java/org/jclouds/glesys/domain/EmailOverviewSummary.java  | 1 -
 .../src/main/java/org/jclouds/glesys/domain/EmailQuota.java   | 1 -
 .../glesys/src/main/java/org/jclouds/glesys/domain/Ip.java    | 1 -
 .../src/main/java/org/jclouds/glesys/domain/OSTemplate.java   | 1 -
 .../main/java/org/jclouds/glesys/domain/ResourceStatus.java   | 1 -
 .../main/java/org/jclouds/glesys/domain/ResourceUsage.java    | 1 -
 .../java/org/jclouds/glesys/domain/ResourceUsageInfo.java     | 1 -
 .../java/org/jclouds/glesys/domain/ResourceUsageValue.java    | 1 -
 .../src/main/java/org/jclouds/glesys/domain/Server.java       | 1 -
 .../main/java/org/jclouds/glesys/domain/ServerDetails.java    | 1 -
 .../src/main/java/org/jclouds/glesys/domain/ServerLimit.java  | 1 -
 .../src/main/java/org/jclouds/glesys/domain/ServerSpec.java   | 2 --
 .../src/main/java/org/jclouds/glesys/domain/ServerStatus.java | 1 -
 .../src/main/java/org/jclouds/glesys/domain/ServerUptime.java | 1 -
 .../src/main/java/org/jclouds/glesys/features/ArchiveApi.java | 1 -
 .../src/main/java/org/jclouds/glesys/features/DomainApi.java  | 1 -
 .../java/org/jclouds/glesys/features/EmailAccountApi.java     | 1 -
 .../src/main/java/org/jclouds/glesys/features/IpApi.java      | 1 -
 .../src/main/java/org/jclouds/glesys/features/ServerApi.java  | 2 --
 .../glesys/functions/ParseTemplatesFromHttpResponse.java      | 3 ---
 .../jclouds/glesys/functions/internal/GleSYSTypeAdapters.java | 3 ---
 .../java/org/jclouds/glesys/handlers/GleSYSErrorHandler.java  | 3 ---
 .../java/org/jclouds/glesys/options/AddDomainOptions.java     | 3 ---
 .../java/org/jclouds/glesys/options/AddRecordOptions.java     | 3 ---
 .../java/org/jclouds/glesys/options/CloneServerOptions.java   | 3 ---
 .../java/org/jclouds/glesys/options/CreateAccountOptions.java | 1 -
 .../java/org/jclouds/glesys/options/CreateServerOptions.java  | 3 ---
 .../java/org/jclouds/glesys/options/DestroyServerOptions.java | 3 ---
 .../main/java/org/jclouds/glesys/options/DomainOptions.java   | 3 ---
 .../main/java/org/jclouds/glesys/options/ListIpOptions.java   | 3 ---
 .../java/org/jclouds/glesys/options/ServerStatusOptions.java  | 3 ---
 .../java/org/jclouds/glesys/options/UpdateAccountOptions.java | 1 -
 .../java/org/jclouds/glesys/options/UpdateRecordOptions.java  | 3 ---
 .../java/org/jclouds/glesys/options/UpdateServerOptions.java  | 4 ----
 .../java/org/jclouds/glesys/reference/GleSYSConstants.java    | 2 --
 .../src/test/java/org/jclouds/glesys/GleSYSApiTest.java       | 2 --
 .../test/java/org/jclouds/glesys/GleSYSErrorHandlerTest.java  | 4 ----
 .../src/test/java/org/jclouds/glesys/GleSYSProviderTest.java  | 4 ----
 .../glesys/compute/GleSYSComputeServiceAdapterExpectTest.java | 4 ----
 .../jclouds/glesys/compute/GleSYSComputeServiceLiveTest.java  | 2 --
 .../jclouds/glesys/compute/GleSYSExperimentExpectTest.java    | 4 ----
 .../org/jclouds/glesys/compute/GleSYSExperimentLiveTest.java  | 4 ----
 .../jclouds/glesys/compute/GleSYSTemplateBuilderLiveTest.java | 4 ----
 .../functions/ParseOsFamilyVersion64BitFromImageNameTest.java | 4 ----
 .../compute/functions/ServerDetailsToNodeMetadataTest.java    | 1 -
 .../glesys/compute/functions/ServerSpecToHardwareTest.java    | 1 -
 .../compute/internal/BaseGleSYSComputeServiceExpectTest.java  | 2 --
 .../glesys/compute/options/GleSYSTemplateOptionsTest.java     | 2 --
 .../org/jclouds/glesys/features/ArchiveApiExpectTest.java     | 2 --
 .../java/org/jclouds/glesys/features/ArchiveApiLiveTest.java  | 2 --
 .../java/org/jclouds/glesys/features/DomainApiExpectTest.java | 2 --
 .../java/org/jclouds/glesys/features/DomainApiLiveTest.java   | 2 --
 .../jclouds/glesys/features/EmailAccountApiExpectTest.java    | 2 --
 .../org/jclouds/glesys/features/EmailAccountApiLiveTest.java  | 2 --
 .../java/org/jclouds/glesys/features/IpApiExpectTest.java     | 2 --
 .../test/java/org/jclouds/glesys/features/IpApiLiveTest.java  | 2 --
 .../java/org/jclouds/glesys/features/ServerApiExpectTest.java | 3 ---
 .../java/org/jclouds/glesys/features/ServerApiLiveTest.java   | 3 ---
 .../org/jclouds/glesys/internal/BaseGleSYSApiExpectTest.java  | 2 --
 .../org/jclouds/glesys/internal/BaseGleSYSApiLiveTest.java    | 2 --
 .../glesys/internal/BaseGleSYSApiWithAServerLiveTest.java     | 2 --
 .../go2cloud/Go2CloudJohannesburg1ProviderMetadata.java       | 2 --
 .../jclouds/go2cloud/Go2CloudJohannesburg1ApiLiveTest.java    | 4 ----
 .../jclouds/go2cloud/Go2CloudJohannesburg1ProviderTest.java   | 2 --
 .../compute/Go2CloudJohannesburg1ComputeServiceLiveTest.java  | 4 ----
 .../compute/Go2CloudJohannesburg1TemplateBuilderLiveTest.java | 4 ----
 .../gogrid/src/main/java/org/jclouds/gogrid/GoGridApi.java    | 3 ---
 .../src/main/java/org/jclouds/gogrid/GoGridApiMetadata.java   | 2 --
 .../main/java/org/jclouds/gogrid/GoGridProviderMetadata.java  | 1 -
 .../main/java/org/jclouds/gogrid/GoGridResponseException.java | 3 ---
 .../java/org/jclouds/gogrid/binders/BindIdsToQueryParams.java | 2 --
 .../org/jclouds/gogrid/binders/BindNamesToQueryParams.java    | 2 --
 .../binders/BindObjectNameToGetJobsRequestQueryParams.java    | 2 --
 .../gogrid/binders/BindRealIpPortPairsToQueryParams.java      | 2 --
 .../gogrid/binders/BindVirtualIpPortPairToQueryParams.java    | 2 --
 .../java/org/jclouds/gogrid/compute/GoGridComputeService.java | 3 ---
 .../compute/config/GoGridComputeServiceContextModule.java     | 5 -----
 .../jclouds/gogrid/compute/functions/OptionToLocation.java    | 4 ----
 .../jclouds/gogrid/compute/functions/ServerImageToImage.java  | 4 ----
 .../gogrid/compute/functions/ServerToNodeMetadata.java        | 3 ---
 .../jclouds/gogrid/compute/options/GoGridTemplateOptions.java | 3 ---
 .../gogrid/compute/strategy/GoGridComputeServiceAdapter.java  | 1 -
 .../gogrid/compute/suppliers/GoGridHardwareSupplier.java      | 4 ----
 .../java/org/jclouds/gogrid/config/GoGridHttpApiModule.java   | 3 ---
 .../java/org/jclouds/gogrid/config/GoGridParserModule.java    | 3 ---
 .../src/main/java/org/jclouds/gogrid/domain/BillingToken.java | 1 -
 .../src/main/java/org/jclouds/gogrid/domain/Customer.java     | 1 -
 .../gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java    | 1 -
 .../src/main/java/org/jclouds/gogrid/domain/IpPortPair.java   | 1 -
 .../src/main/java/org/jclouds/gogrid/domain/IpState.java      | 3 ---
 .../src/main/java/org/jclouds/gogrid/domain/IpType.java       | 3 ---
 .../gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java   | 1 -
 .../main/java/org/jclouds/gogrid/domain/JobProperties.java    | 1 -
 .../src/main/java/org/jclouds/gogrid/domain/JobState.java     | 3 ---
 .../src/main/java/org/jclouds/gogrid/domain/LoadBalancer.java | 1 -
 .../main/java/org/jclouds/gogrid/domain/LoadBalancerOs.java   | 3 ---
 .../jclouds/gogrid/domain/LoadBalancerPersistenceType.java    | 3 ---
 .../java/org/jclouds/gogrid/domain/LoadBalancerState.java     | 3 ---
 .../main/java/org/jclouds/gogrid/domain/LoadBalancerType.java | 3 ---
 .../src/main/java/org/jclouds/gogrid/domain/ObjectType.java   | 3 ---
 .../src/main/java/org/jclouds/gogrid/domain/Option.java       | 1 -
 .../src/main/java/org/jclouds/gogrid/domain/PowerCommand.java | 2 --
 .../src/main/java/org/jclouds/gogrid/domain/Server.java       | 1 -
 .../src/main/java/org/jclouds/gogrid/domain/ServerImage.java  | 1 -
 .../main/java/org/jclouds/gogrid/domain/ServerImageState.java | 3 ---
 .../main/java/org/jclouds/gogrid/domain/ServerImageType.java  | 3 ---
 .../src/main/java/org/jclouds/gogrid/domain/ServerState.java  | 3 ---
 .../org/jclouds/gogrid/domain/internal/ErrorResponse.java     | 2 --
 .../main/java/org/jclouds/gogrid/features/GridImageApi.java   | 1 -
 .../src/main/java/org/jclouds/gogrid/features/GridIpApi.java  | 3 ---
 .../src/main/java/org/jclouds/gogrid/features/GridJobApi.java | 2 --
 .../java/org/jclouds/gogrid/features/GridLoadBalancerApi.java | 3 ---
 .../main/java/org/jclouds/gogrid/features/GridServerApi.java  | 3 ---
 .../jclouds/gogrid/filters/SharedKeyLiteAuthentication.java   | 3 ---
 .../jclouds/gogrid/functions/GenericResponseContainer.java    | 2 --
 .../gogrid/functions/ParseCredentialsFromJsonResponse.java    | 4 ----
 .../jclouds/gogrid/functions/ParseImageFromJsonResponse.java  | 3 ---
 .../gogrid/functions/ParseImageListFromJsonResponse.java      | 3 ---
 .../jclouds/gogrid/functions/ParseIpListFromJsonResponse.java | 2 --
 .../gogrid/functions/ParseJobListFromJsonResponse.java        | 2 --
 .../gogrid/functions/ParseLoadBalancerFromJsonResponse.java   | 2 --
 .../functions/ParseLoadBalancerListFromJsonResponse.java      | 2 --
 .../gogrid/functions/ParseOptionsFromJsonResponse.java        | 2 --
 .../ParseServerNameToCredentialsMapFromJsonResponse.java      | 3 ---
 .../gogrid/functions/internal/CustomDeserializers.java        | 3 ---
 .../java/org/jclouds/gogrid/handlers/GoGridErrorHandler.java  | 3 ---
 .../gogrid/location/GoGridDefaultLocationSupplier.java        | 4 ----
 .../org/jclouds/gogrid/options/AddLoadBalancerOptions.java    | 2 --
 .../java/org/jclouds/gogrid/options/AddServerOptions.java     | 3 ---
 .../java/org/jclouds/gogrid/options/GetImageListOptions.java  | 3 ---
 .../java/org/jclouds/gogrid/options/GetIpListOptions.java     | 3 ---
 .../java/org/jclouds/gogrid/options/GetJobListOptions.java    | 3 ---
 .../java/org/jclouds/gogrid/options/GetServerListOptions.java | 3 ---
 .../java/org/jclouds/gogrid/options/SaveImageOptions.java     | 3 ---
 .../gogrid/predicates/LoadBalancerLatestJobCompleted.java     | 3 ---
 .../jclouds/gogrid/predicates/ServerLatestJobCompleted.java   | 2 --
 .../main/java/org/jclouds/gogrid/reference/GoGridHeaders.java | 3 ---
 .../java/org/jclouds/gogrid/reference/GoGridQueryParams.java  | 3 ---
 .../src/test/java/org/jclouds/gogrid/GoGridApiTest.java       | 2 --
 .../test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java  | 2 --
 .../src/test/java/org/jclouds/gogrid/GoGridProviderTest.java  | 4 ----
 .../org/jclouds/gogrid/binders/BindIdsToQueryParamsTest.java  | 2 --
 .../jclouds/gogrid/binders/BindNamesToQueryParamsTest.java    | 2 --
 .../jclouds/gogrid/compute/GoGridComputeServiceLiveTest.java  | 3 ---
 .../jclouds/gogrid/compute/GoGridTemplateBuilderLiveTest.java | 4 ----
 .../compute/config/GoGridComputeServiceContextModuleTest.java | 3 ---
 .../gogrid/compute/functions/ServerToNodeMetadataTest.java    | 3 ---
 .../gogrid/compute/options/GoGridTemplateOptionsTest.java     | 2 --
 .../org/jclouds/gogrid/features/BaseGoGridApiLiveTest.java    | 2 --
 .../java/org/jclouds/gogrid/features/BaseGoGridApiTest.java   | 4 ----
 .../jclouds/gogrid/features/BaseGoGridHttpApiExpectTest.java  | 4 ----
 .../org/jclouds/gogrid/features/GridImageApiLiveTest.java     | 4 ----
 .../java/org/jclouds/gogrid/features/GridImageApiTest.java    | 2 --
 .../test/java/org/jclouds/gogrid/features/GridIpApiTest.java  | 2 --
 .../java/org/jclouds/gogrid/features/GridJobApiLiveTest.java  | 4 ----
 .../test/java/org/jclouds/gogrid/features/GridJobApiTest.java | 2 --
 .../org/jclouds/gogrid/features/GridLoadBalancerApiTest.java  | 2 --
 .../java/org/jclouds/gogrid/features/GridServerApiTest.java   | 2 --
 .../jclouds/gogrid/features/GridServerClientExpectTest.java   | 4 ----
 .../functions/ParseCredentialsFromJsonResponseTest.java       | 3 ---
 .../gogrid/functions/ParseJobsFromJsonResponseTest.java       | 3 ---
 .../functions/ParseLoadBalancersFromJsonResponseTest.java     | 3 ---
 .../ParseServerNameToCredentialsMapFromJsonResponseTest.java  | 3 ---
 .../org/jclouds/gogrid/handlers/GoGridErrorHandlerTest.java   | 2 --
 .../java/org/jclouds/gogrid/options/AddServerOptionsTest.java | 2 --
 .../java/org/jclouds/gogrid/options/SaveImageOptionsTest.java | 2 --
 .../java/org/jclouds/gogrid/parse/ParseServerListTest.java    | 3 ---
 .../test/java/org/jclouds/gogrid/parse/ParseServerTest.java   | 3 ---
 .../gogrid/predicates/ServerLatestJobCompletedTest.java       | 3 ---
 .../vcloud/GreenHouseDataElementVCloudProviderMetadata.java   | 2 --
 ...reenHouseDataElementVCloudComputeServiceContextModule.java | 2 --
 .../vcloud/GreenHouseDataElementVCloudProviderTest.java       | 4 ----
 .../GreenHouseDataElementVCloudComputeServiceLiveTest.java    | 5 -----
 .../GreenHouseDataElementVCloudTemplateBuilderLiveTest.java   | 4 ----
 .../GreenHouseDataElementVCloudCatalogApiLiveTest.java        | 5 -----
 .../GreenHouseDataElementVCloudNetworkApiLiveTest.java        | 5 -----
 .../features/GreenHouseDataElementVCloudOrgApiLiveTest.java   | 5 -----
 .../features/GreenHouseDataElementVCloudTaskApiLiveTest.java  | 5 -----
 .../features/GreenHouseDataElementVCloudVAppApiLiveTest.java  | 5 -----
 .../GreenHouseDataElementVCloudVAppTemplateApiLiveTest.java   | 5 -----
 .../features/GreenHouseDataElementVCloudVDCApiLiveTest.java   | 5 -----
 .../features/GreenHouseDataElementVCloudVmApiLiveTest.java    | 5 -----
 .../hpcloud/compute/HPCloudComputeProviderMetadata.java       | 2 --
 .../jclouds/hpcloud/compute/HPCloudComputeServiceAdapter.java | 4 ----
 .../compute/config/HPCloudComputeServiceContextModule.java    | 4 ----
 .../compute/HPCloudComputeProviderMetadataExpectTest.java     | 2 --
 .../jclouds/hpcloud/compute/HPCloudComputeProviderTest.java   | 4 ----
 .../compute/compute/HPCloudComputeComputeServiceLiveTest.java | 4 ----
 .../compute/HPCloudComputeTemplateBuilderLiveTest.java        | 4 ----
 .../extensions/HPCloudComputeImageExtensionLivetest.java      | 5 -----
 .../HPCloudComputeSecurityGroupExtensionLiveTest.java         | 5 -----
 .../compute/features/HPCloudComputeFlavorApiLiveTest.java     | 4 ----
 .../compute/features/HPCloudComputeFloatingIPApiLiveTest.java | 4 ----
 .../compute/features/HPCloudComputeImageApiLiveTest.java      | 4 ----
 .../compute/features/HPCloudComputeKeyPairApiLiveTest.java    | 4 ----
 .../features/HPCloudComputeSecurityGroupApiLiveTest.java      | 4 ----
 .../compute/features/HPCloudComputeServerApiLiveTest.java     | 4 ----
 .../compute/features/HPCloudComputeVolumeApiLiveTest.java     | 4 ----
 .../java/org/jclouds/hpcloud/objectstorage/CDNManagement.java | 2 --
 .../hpcloud/objectstorage/HPCloudObjectStorageApi.java        | 1 -
 .../objectstorage/HPCloudObjectStorageApiMetadata.java        | 2 --
 .../hpcloud/objectstorage/HPCloudObjectStorageAsyncApi.java   | 1 -
 .../objectstorage/HPCloudObjectStorageProviderMetadata.java   | 2 --
 .../blobstore/HPCloudObjectStorageAsyncBlobStore.java         | 1 -
 .../blobstore/HPCloudObjectStorageBlobRequestSigner.java      | 2 --
 .../blobstore/HPCloudObjectStorageBlobStore.java              | 4 ----
 .../config/HPCloudObjectStorageBlobStoreContextModule.java    | 4 ----
 .../objectstorage/blobstore/functions/EnableCDNAndCache.java  | 4 ----
 .../functions/HPCloudObjectStorageObjectToBlobMetadata.java   | 3 ---
 .../blobstore/functions/PublicUriForObjectInfo.java           | 3 ---
 .../config/HPCloudObjectStorageRestClientModule.java          | 4 ----
 .../hpcloud/objectstorage/extensions/CDNContainerApi.java     | 1 -
 .../objectstorage/extensions/CDNContainerAsyncApi.java        | 1 -
 .../objectstorage/functions/ParseCDNContainerFromHeaders.java | 2 --
 .../objectstorage/functions/ParseCDNUriFromHeaders.java       | 2 --
 .../java/org/jclouds/hpcloud/objectstorage/package-info.java  | 2 --
 .../reference/HPCloudObjectStorageConstants.java              | 2 --
 .../objectstorage/reference/HPCloudObjectStorageHeaders.java  | 2 --
 .../jclouds/hpcloud/objectstorage/reference/package-info.java | 2 --
 .../org/jclouds/hpcloud/services/HPExtensionBlockStore.java   | 1 -
 .../java/org/jclouds/hpcloud/services/HPExtensionCDN.java     | 1 -
 .../org/jclouds/hpcloud/services/HPExtensionServiceType.java  | 1 -
 .../objectstorage/HPCloudObjectStorageClientLiveTest.java     | 4 ----
 .../objectstorage/HPCloudObjectStorageProviderTest.java       | 2 --
 .../blobstore/HPCloudObjectStorageBlobSignerExpectTest.java   | 2 --
 .../HPCloudObjectStorageBlobIntegrationLiveTest.java          | 3 ---
 .../integration/HPCloudObjectStorageBlobLiveTest.java         | 3 ---
 .../integration/HPCloudObjectStorageBlobSignerLiveTest.java   | 3 ---
 .../HPCloudObjectStorageContainerIntegrationLiveTest.java     | 3 ---
 .../integration/HPCloudObjectStorageContainerLiveTest.java    | 3 ---
 .../HPCloudObjectStorageServiceIntegrationLiveTest.java       | 3 ---
 .../hpcloud/objectstorage/internal/KeystoneFixture.java       | 2 --
 .../hpcloud/objectstorage/parse/CDNContainersTest.java        | 3 ---
 .../ninefold/compute/NinefoldComputeProviderMetadata.java     | 1 -
 .../jclouds/ninefold/compute/NinefoldComputeProviderTest.java | 2 --
 .../compute/compute/NinefoldComputeServiceLiveTest.java       | 4 ----
 .../compute/NinefoldComputeTemplateBuilderLiveTest.java       | 4 ----
 .../ninefold/storage/NinefoldStorageProviderMetadata.java     | 2 --
 .../ninefold/storage/NinefoldStorageAsyncClientTest.java      | 3 ---
 .../ninefold/storage/NinefoldStorageClientLiveTest.java       | 2 --
 .../jclouds/ninefold/storage/NinefoldStorageProviderTest.java | 2 --
 .../integration/NinefoldStorageBlobIntegrationLiveTest.java   | 3 ---
 .../blobstore/integration/NinefoldStorageBlobLiveTest.java    | 3 ---
 .../integration/NinefoldStorageBlobSignerLiveTest.java        | 4 ----
 .../NinefoldStorageContainerIntegrationLiveTest.java          | 3 ---
 .../integration/NinefoldStorageContainerLiveTest.java         | 3 ---
 .../NinefoldStorageServiceIntegrationLiveTest.java            | 3 ---
 .../jclouds/openhosting/OpenHostingEast1ProviderMetadata.java | 2 --
 .../config/OpenHostingEast1ComputeServiceContextModule.java   | 4 ----
 .../org/jclouds/openhosting/OpenHostingEast1ApiLiveTest.java  | 4 ----
 .../org/jclouds/openhosting/OpenHostingEast1ProviderTest.java | 2 --
 .../compute/OpenHostingEast1ComputeServiceLiveTest.java       | 4 ----
 .../compute/OpenHostingEast1TemplateBuilderLiveTest.java      | 4 ----
 .../uk/CloudBlockStorageUKProviderMetadata.java               | 2 --
 .../uk/CloudBlockStorageUKProviderMetadataExpectTest.java     | 2 --
 .../cloudblockstorage/uk/CloudBlockStorageUKProviderTest.java | 3 ---
 .../CloudBlockStorageUKVolumeAndSnapshotApiLiveTest.java      | 3 ---
 .../uk/features/CloudBlockStorageUKVolumeTypeApiLiveTest.java | 3 ---
 .../us/CloudBlockStorageUSProviderMetadata.java               | 2 --
 .../us/CloudBlockStorageUSProviderMetadataExpectTest.java     | 2 --
 .../cloudblockstorage/us/CloudBlockStorageUSProviderTest.java | 3 ---
 .../CloudBlockStorageUSVolumeAndSnapshotApiLiveTest.java      | 3 ---
 .../us/features/CloudBlockStorageUSVolumeTypeApiLiveTest.java | 3 ---
 .../clouddatabases/uk/CloudDatabasesUKProviderMetadata.java   | 2 --
 .../uk/CloudDatabasesUKProviderMetadataExpectTest.java        | 2 --
 .../clouddatabases/uk/CloudDatabasesUKProviderTest.java       | 3 ---
 .../uk/features/CloudDatabasesUKDatabaseApiLiveTest.java      | 3 ---
 .../uk/features/CloudDatabasesUKFlavorApiLiveTest.java        | 3 ---
 .../uk/features/CloudDatabasesUKInstanceApiLiveTest.java      | 3 ---
 .../uk/features/CloudDatabasesUKUserApiLiveTest.java          | 3 ---
 .../clouddatabases/us/CloudDatabasesUSProviderMetadata.java   | 2 --
 .../us/CloudDatabasesUSProviderMetadataExpectTest.java        | 2 --
 .../clouddatabases/us/CloudDatabasesUSProviderTest.java       | 3 ---
 .../us/features/CloudDatabasesUSDatabaseApiLiveTest.java      | 3 ---
 .../us/features/CloudDatabasesUSFlavorApiLiveTest.java        | 3 ---
 .../us/features/CloudDatabasesUSInstanceApiLiveTest.java      | 3 ---
 .../us/features/CloudDatabasesUSUserApiLiveTest.java          | 3 ---
 .../rackspace/clouddns/uk/CloudDNSUKProviderMetadata.java     | 2 --
 .../clouddns/uk/features/CloudDNSUKDomainApiLiveTest.java     | 4 ----
 .../clouddns/uk/features/CloudDNSUKLimitApiLiveTest.java      | 4 ----
 .../clouddns/uk/features/CloudDNSUKProviderTest.java          | 4 ----
 .../clouddns/uk/features/CloudDNSUKRecordApiLiveTest.java     | 4 ----
 .../rackspace/clouddns/us/CloudDNSUSProviderMetadata.java     | 2 --
 .../clouddns/us/features/CloudDNSUSDomainApiLiveTest.java     | 4 ----
 .../clouddns/us/features/CloudDNSUSLimitApiLiveTest.java      | 4 ----
 .../clouddns/us/features/CloudDNSUSProviderTest.java          | 4 ----
 .../clouddns/us/features/CloudDNSUSRecordApiLiveTest.java     | 4 ----
 .../clouddns/us/features/CloudDNSUSReverseDNSApiLiveTest.java | 4 ----
 .../uk/CloudLoadBalancersUKProviderMetadata.java              | 2 --
 .../uk/CloudLoadBalancersUKLoadBalancerClientLiveTest.java    | 4 ----
 .../uk/CloudLoadBalancersUKNodeClientLiveTest.java            | 4 ----
 .../uk/CloudLoadBalancersUKProviderTest.java                  | 4 ----
 .../us/CloudLoadBalancersUSProviderMetadata.java              | 2 --
 .../us/CloudLoadBalancersUSLoadBalancerClientLiveTest.java    | 4 ----
 .../us/CloudLoadBalancersUSNodeClientLiveTest.java            | 4 ----
 .../us/CloudLoadBalancersUSProviderTest.java                  | 4 ----
 .../cloudservers/uk/CloudServersUKProviderMetadata.java       | 2 --
 .../uk/config/CloudServersUKComputeServiceContextModule.java  | 4 ----
 .../uk/CloudServersUKProviderMetadataExpectTest.java          | 2 --
 .../rackspace/cloudservers/uk/CloudServersUKProviderTest.java | 4 ----
 .../uk/compute/CloudServersUKComputeServiceLiveTest.java      | 4 ----
 .../uk/compute/CloudServersUKTemplateBuilderLiveTest.java     | 4 ----
 .../extensions/CloudServersUKImageExtensionLivetest.java      | 5 -----
 .../uk/features/CloudServersUKFlavorApiLiveTest.java          | 4 ----
 .../uk/features/CloudServersUKImageApiLiveTest.java           | 4 ----
 .../uk/features/CloudServersUKServerApiLiveTest.java          | 4 ----
 .../cloudservers/us/CloudServersUSProviderMetadata.java       | 2 --
 .../us/config/CloudServersUSComputeServiceContextModule.java  | 4 ----
 .../us/CloudServersUSProviderMetadataExpectTest.java          | 2 --
 .../rackspace/cloudservers/us/CloudServersUSProviderTest.java | 4 ----
 .../us/compute/CloudServersUSComputeServiceLiveTest.java      | 4 ----
 .../us/compute/CloudServersUSTemplateBuilderLiveTest.java     | 4 ----
 .../extensions/CloudServersUSImageExtensionLivetest.java      | 5 -----
 .../us/features/CloudServersUSFlavorApiLiveTest.java          | 4 ----
 .../us/features/CloudServersUSImageApiLiveTest.java           | 4 ----
 .../us/features/CloudServersUSServerApiLiveTest.java          | 4 ----
 .../serverlove/ServerloveManchesterProviderMetadata.java      | 2 --
 .../org/jclouds/serverlove/config/ServerloveImagesModule.java | 2 --
 .../serverlove/suppliers/FixedWellKnownImageSupplier.java     | 3 ---
 .../jclouds/serverlove/ServerloveManchesterApiLiveTest.java   | 4 ----
 .../jclouds/serverlove/ServerloveManchesterProviderTest.java  | 4 ----
 .../compute/ServerloveManchesterComputeServiceLiveTest.java   | 4 ----
 .../compute/ServerloveManchesterTemplateBuilderLiveTest.java  | 4 ----
 .../skalicloud/SkaliCloudMalaysiaProviderMetadata.java        | 2 --
 .../org/jclouds/skalicloud/SkaliCloudMalaysiaApiLiveTest.java | 4 ----
 .../jclouds/skalicloud/SkaliCloudMalaysiaProviderTest.java    | 4 ----
 .../compute/SkaliCloudMalaysiaComputeServiceLiveTest.java     | 4 ----
 .../compute/SkaliCloudMalaysiaTemplateBuilderLiveTest.java    | 4 ----
 .../src/main/java/org/jclouds/softlayer/SoftLayerApi.java     | 1 -
 .../main/java/org/jclouds/softlayer/SoftLayerApiMetadata.java | 2 --
 .../java/org/jclouds/softlayer/SoftLayerProviderMetadata.java | 1 -
 .../org/jclouds/softlayer/binders/ProductOrderToJson.java     | 2 --
 .../compute/config/SoftLayerComputeServiceContextModule.java  | 4 ----
 .../softlayer/compute/functions/ProductItemToImage.java       | 3 ---
 .../softlayer/compute/functions/ProductItemsToHardware.java   | 2 --
 .../compute/functions/VirtualGuestToNodeMetadata.java         | 3 ---
 .../softlayer/compute/options/SoftLayerTemplateOptions.java   | 2 --
 .../compute/strategy/SoftLayerComputeServiceAdapter.java      | 1 -
 .../org/jclouds/softlayer/config/SoftLayerHttpApiModule.java  | 2 --
 .../org/jclouds/softlayer/config/SoftLayerParserModule.java   | 4 ----
 .../src/main/java/org/jclouds/softlayer/domain/Address.java   | 1 -
 .../main/java/org/jclouds/softlayer/domain/Datacenter.java    | 1 -
 .../java/org/jclouds/softlayer/domain/OperatingSystem.java    | 1 -
 .../src/main/java/org/jclouds/softlayer/domain/Password.java  | 1 -
 .../main/java/org/jclouds/softlayer/domain/PowerState.java    | 1 -
 .../main/java/org/jclouds/softlayer/domain/ProductItem.java   | 1 -
 .../org/jclouds/softlayer/domain/ProductItemCategory.java     | 1 -
 .../java/org/jclouds/softlayer/domain/ProductItemPrice.java   | 1 -
 .../main/java/org/jclouds/softlayer/domain/ProductOrder.java  | 1 -
 .../org/jclouds/softlayer/domain/ProductOrderReceipt.java     | 1 -
 .../java/org/jclouds/softlayer/domain/ProductPackage.java     | 1 -
 .../src/main/java/org/jclouds/softlayer/domain/Region.java    | 1 -
 .../main/java/org/jclouds/softlayer/domain/VirtualGuest.java  | 1 -
 .../main/java/org/jclouds/softlayer/features/AccountApi.java  | 1 -
 .../java/org/jclouds/softlayer/features/DatacenterApi.java    | 1 -
 .../org/jclouds/softlayer/features/ProductPackageApi.java     | 1 -
 .../java/org/jclouds/softlayer/features/VirtualGuestApi.java  | 1 -
 .../org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java | 3 ---
 .../org/jclouds/softlayer/reference/SoftLayerConstants.java   | 2 --
 .../src/test/java/org/jclouds/softlayer/SoftLayerApiTest.java | 2 --
 .../java/org/jclouds/softlayer/SoftLayerProviderTest.java     | 4 ----
 .../org/jclouds/softlayer/binders/ProductOrderToJsonTest.java | 2 --
 .../softlayer/compute/SoftLayerComputeServiceLiveTest.java    | 2 --
 .../softlayer/compute/SoftLayerTemplateBuilderLiveTest.java   | 4 ----
 .../softlayer/compute/functions/DatacenterToLocationTest.java | 2 --
 .../softlayer/compute/functions/ProductItemToImageTest.java   | 2 --
 .../jclouds/softlayer/compute/functions/ProductItemsTest.java | 2 --
 .../compute/functions/ProductItemsToHardwareTest.java         | 2 --
 .../compute/functions/VirtualGuestToNodeMetadataTest.java     | 3 ---
 .../compute/options/SoftLayerTemplateOptionsTest.java         | 2 --
 .../test/java/org/jclouds/softlayer/domain/AddressTest.java   | 2 --
 .../org/jclouds/softlayer/features/AccountApiLiveTest.java    | 2 --
 .../java/org/jclouds/softlayer/features/AccountApiTest.java   | 2 --
 .../jclouds/softlayer/features/BaseSoftLayerApiLiveTest.java  | 2 --
 .../org/jclouds/softlayer/features/BaseSoftLayerApiTest.java  | 3 ---
 .../org/jclouds/softlayer/features/DatacenterApiLiveTest.java | 2 --
 .../org/jclouds/softlayer/features/DatacenterApiTest.java     | 2 --
 .../jclouds/softlayer/features/ProductPackageApiLiveTest.java | 2 --
 .../org/jclouds/softlayer/features/ProductPackageApiTest.java | 2 --
 .../jclouds/softlayer/features/VirtualGuestApiExpectTest.java | 4 ----
 .../jclouds/softlayer/features/VirtualGuestApiLiveTest.java   | 2 --
 .../org/jclouds/softlayer/features/VirtualGuestApiTest.java   | 2 --
 .../jclouds/softlayer/handlers/SoftLayerErrorHandlerTest.java | 4 ----
 .../org/jclouds/softlayer/parse/ParseBadVirtualGuest.java     | 4 ----
 .../org/jclouds/softlayer/parse/ParseProductOrderTest.java    | 4 ----
 .../jclouds/softlayer/parse/ParseVirtualGuestHaltedTest.java  | 4 ----
 .../jclouds/softlayer/parse/ParseVirtualGuestPausedTest.java  | 4 ----
 .../jclouds/softlayer/parse/ParseVirtualGuestRunningTest.java | 4 ----
 .../softlayer/parse/ParseVirtualGuestWithNoPasswordTest.java  | 4 ----
 .../softlayer/predicates/ProductPackagePredicatesTest.java    | 2 --
 .../src/main/java/org/jclouds/ultradns/ws/UltraDNSWSApi.java  | 1 -
 .../java/org/jclouds/ultradns/ws/UltraDNSWSApiMetadata.java   | 2 --
 .../main/java/org/jclouds/ultradns/ws/UltraDNSWSError.java    | 3 ---
 .../java/org/jclouds/ultradns/ws/UltraDNSWSExceptions.java    | 2 --
 .../org/jclouds/ultradns/ws/UltraDNSWSProviderMetadata.java   | 2 --
 .../org/jclouds/ultradns/ws/UltraDNSWSResponseException.java  | 1 -
 .../ultradns/ws/binders/DirectionalGroupCoordinatesToXML.java | 4 ----
 .../ws/binders/DirectionalRecordAndGeoGroupToXML.java         | 4 ----
 .../ultradns/ws/binders/UpdateDirectionalDNSGroupToXML.java   | 4 ----
 .../jclouds/ultradns/ws/binders/UpdatePoolRecordToXML.java    | 4 ----
 .../ultradns/ws/binders/ZoneAndResourceRecordToXML.java       | 4 ----
 .../jclouds/ultradns/ws/config/UltraDNSWSHttpApiModule.java   | 2 --
 .../org/jclouds/ultradns/ws/domain/AccountLevelGroup.java     | 4 ----
 .../java/org/jclouds/ultradns/ws/domain/DirectionalGroup.java | 2 --
 .../ultradns/ws/domain/DirectionalGroupCoordinates.java       | 3 ---
 .../java/org/jclouds/ultradns/ws/domain/DirectionalPool.java  | 2 --
 .../org/jclouds/ultradns/ws/domain/DirectionalPoolRecord.java | 3 ---
 .../ultradns/ws/domain/DirectionalPoolRecordDetail.java       | 3 ---
 .../main/java/org/jclouds/ultradns/ws/domain/IdAndName.java   | 3 ---
 .../java/org/jclouds/ultradns/ws/domain/PoolRecordSpec.java   | 2 --
 .../java/org/jclouds/ultradns/ws/domain/ResourceRecord.java   | 3 ---
 .../org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java  | 4 ----
 .../java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java   | 4 ----
 .../src/main/java/org/jclouds/ultradns/ws/domain/Task.java    | 4 ----
 .../org/jclouds/ultradns/ws/domain/TrafficControllerPool.java | 2 --
 .../ultradns/ws/domain/TrafficControllerPoolRecord.java       | 3 ---
 .../ultradns/ws/domain/TrafficControllerPoolRecordDetail.java | 4 ----
 .../java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java | 2 --
 .../src/main/java/org/jclouds/ultradns/ws/domain/Zone.java    | 4 ----
 .../java/org/jclouds/ultradns/ws/domain/ZoneProperties.java   | 4 ----
 .../org/jclouds/ultradns/ws/features/DirectionalGroupApi.java | 1 -
 .../org/jclouds/ultradns/ws/features/DirectionalPoolApi.java  | 1 -
 .../org/jclouds/ultradns/ws/features/ResourceRecordApi.java   | 1 -
 .../org/jclouds/ultradns/ws/features/RoundRobinPoolApi.java   | 1 -
 .../main/java/org/jclouds/ultradns/ws/features/TaskApi.java   | 1 -
 .../ultradns/ws/features/TrafficControllerPoolApi.java        | 1 -
 .../main/java/org/jclouds/ultradns/ws/features/ZoneApi.java   | 1 -
 .../jclouds/ultradns/ws/filters/SOAPWrapWithPasswordAuth.java | 3 ---
 .../jclouds/ultradns/ws/handlers/UltraDNSWSErrorHandler.java  | 3 ---
 .../ultradns/ws/predicates/DirectionalPoolPredicates.java     | 2 --
 .../ws/predicates/TrafficControllerPoolPredicates.java        | 2 --
 .../org/jclouds/ultradns/ws/predicates/ZonePredicates.java    | 2 --
 .../main/java/org/jclouds/ultradns/ws/xml/AccountHandler.java | 4 ----
 .../jclouds/ultradns/ws/xml/AccountLevelGroupsHandler.java    | 4 ----
 .../java/org/jclouds/ultradns/ws/xml/AttributeHandler.java    | 3 ---
 .../org/jclouds/ultradns/ws/xml/DirectionalGroupHandler.java  | 4 ----
 .../jclouds/ultradns/ws/xml/DirectionalPoolListHandler.java   | 4 ----
 .../ultradns/ws/xml/DirectionalPoolRecordDetailHandler.java   | 4 ----
 .../ws/xml/DirectionalPoolRecordDetailListHandler.java        | 4 ----
 .../java/org/jclouds/ultradns/ws/xml/ElementTextHandler.java  | 4 ----
 .../java/org/jclouds/ultradns/ws/xml/ItemListHandler.java     | 4 ----
 .../org/jclouds/ultradns/ws/xml/PoolRecordSpecHandler.java    | 4 ----
 .../java/org/jclouds/ultradns/ws/xml/RegionListHandler.java   | 4 ----
 .../jclouds/ultradns/ws/xml/ResourceRecordDetailHandler.java  | 4 ----
 .../jclouds/ultradns/ws/xml/ResourceRecordListHandler.java    | 4 ----
 .../org/jclouds/ultradns/ws/xml/RoundRobinPoolHandler.java    | 4 ----
 .../jclouds/ultradns/ws/xml/RoundRobinPoolListHandler.java    | 4 ----
 .../main/java/org/jclouds/ultradns/ws/xml/TaskHandler.java    | 4 ----
 .../java/org/jclouds/ultradns/ws/xml/TaskListHandler.java     | 4 ----
 .../jclouds/ultradns/ws/xml/TrafficControllerPoolHandler.java | 4 ----
 .../ultradns/ws/xml/TrafficControllerPoolListHandler.java     | 4 ----
 .../ws/xml/TrafficControllerPoolRecordDetailListHandler.java  | 4 ----
 .../org/jclouds/ultradns/ws/xml/UltraWSExceptionHandler.java  | 4 ----
 .../main/java/org/jclouds/ultradns/ws/xml/ZoneHandler.java    | 4 ----
 .../java/org/jclouds/ultradns/ws/xml/ZoneListHandler.java     | 4 ----
 .../org/jclouds/ultradns/ws/xml/ZonePropertiesHandler.java    | 4 ----
 .../java/org/jclouds/ultradns/ws/UltraDNSWSApiExpectTest.java | 3 ---
 .../java/org/jclouds/ultradns/ws/UltraDNSWSApiLiveTest.java   | 3 ---
 .../jclouds/ultradns/ws/UltraDNSWSProviderMetadataTest.java   | 4 ----
 .../ultradns/ws/binders/ZoneAndResourceRecordToXMLTest.java   | 4 ----
 .../ultradns/ws/features/DirectionalGroupApiExpectTest.java   | 3 ---
 .../ultradns/ws/features/DirectionalGroupApiLiveTest.java     | 3 ---
 .../ultradns/ws/features/DirectionalPoolApiExpectTest.java    | 3 ---
 .../ultradns/ws/features/DirectionalPoolApiLiveTest.java      | 3 ---
 .../ultradns/ws/features/ResourceRecordApiExpectTest.java     | 3 ---
 .../ultradns/ws/features/ResourceRecordApiLiveTest.java       | 3 ---
 .../ultradns/ws/features/RoundRobinPoolApiExpectTest.java     | 3 ---
 .../ultradns/ws/features/RoundRobinPoolApiLiveTest.java       | 3 ---
 .../org/jclouds/ultradns/ws/features/TaskApiExpectTest.java   | 3 ---
 .../org/jclouds/ultradns/ws/features/TaskApiLiveTest.java     | 3 ---
 .../ws/features/TrafficControllerPoolApiExpectTest.java       | 3 ---
 .../ws/features/TrafficControllerPoolApiLiveTest.java         | 3 ---
 .../org/jclouds/ultradns/ws/features/ZoneApiExpectTest.java   | 3 ---
 .../org/jclouds/ultradns/ws/features/ZoneApiLiveTest.java     | 3 ---
 .../ultradns/ws/handlers/UltraDNSWSErrorHandlerTest.java      | 4 ----
 .../ultradns/ws/internal/BaseDirectionalApiLiveTest.java      | 3 ---
 .../ultradns/ws/internal/BaseUltraDNSWSApiExpectTest.java     | 4 ----
 .../ultradns/ws/internal/BaseUltraDNSWSApiLiveTest.java       | 4 ----
 .../ultradns/ws/internal/BaseUltraDNSWSExpectTest.java        | 4 ----
 .../parse/GetAccountLevelDirectionalGroupsResponseTest.java   | 3 ---
 .../ultradns/ws/parse/GetAccountsListOfUserResponseTest.java  | 3 ---
 .../jclouds/ultradns/ws/parse/GetAllTasksResponseTest.java    | 3 ---
 .../ultradns/ws/parse/GetAvailableGroupsResponseTest.java     | 3 ---
 .../ultradns/ws/parse/GetAvailableRegionsResponseTest.java    | 3 ---
 .../ws/parse/GetDirectionalDNSGroupDetailsResponseTest.java   | 3 ---
 .../ws/parse/GetDirectionalDNSRecordsForHostResponseTest.java | 3 ---
 .../ws/parse/GetDirectionalPoolsByZoneResponseTest.java       | 3 ---
 .../ws/parse/GetGeneralPropertiesForZoneResponseTest.java     | 3 ---
 .../ultradns/ws/parse/GetPoolForPoolHostNameResponseTest.java | 3 ---
 .../ultradns/ws/parse/GetPoolRecordSpecResponseTest.java      | 3 ---
 .../ws/parse/GetRRLoadBalancingPoolsByZoneResponseTest.java   | 3 ---
 .../ws/parse/GetResourceRecordsOfDNameByTypeResponseTest.java | 3 ---
 .../parse/GetResourceRecordsOfResourceRecordResponseTest.java | 3 ---
 .../ws/parse/GetStatusForTaskResponseResponseTest.java        | 3 ---
 .../ws/parse/GetTCLoadBalancingPoolsByZoneResponseTest.java   | 3 ---
 .../ultradns/ws/parse/GetTCPoolRecordsResponseTest.java       | 3 ---
 .../ultradns/ws/parse/GetZonesOfAccountResponseTest.java      | 3 ---
 .../org/jclouds/ultradns/ws/parse/RunTestResponseTest.java    | 3 ---
 .../java/org/jclouds/ultradns/ws/parse/TaskNotFoundTest.java  | 3 ---
 .../org/jclouds/ultradns/ws/parse/UltraWSExceptionTest.java   | 3 ---
 .../ultradns/ws/predicates/DirectionalPoolPredicatesTest.java | 4 ----
 .../ws/predicates/TrafficControllerPoolPredicatesTest.java    | 4 ----
 .../jclouds/ultradns/ws/predicates/ZonePredicatesTest.java    | 4 ----
 .../src/main/java/org/jclouds/scriptbuilder/EnvBuilder.java   | 2 --
 .../java/org/jclouds/scriptbuilder/ExitInsteadOfReturn.java   | 3 ---
 .../src/main/java/org/jclouds/scriptbuilder/InitScript.java   | 2 --
 .../main/java/org/jclouds/scriptbuilder/ScriptBuilder.java    | 2 --
 .../jclouds/scriptbuilder/domain/AcceptsStatementVisitor.java | 4 ----
 .../org/jclouds/scriptbuilder/domain/AdminAccessVisitor.java  | 4 ----
 .../java/org/jclouds/scriptbuilder/domain/AppendFile.java     | 2 --
 .../src/main/java/org/jclouds/scriptbuilder/domain/Call.java  | 2 --
 .../jclouds/scriptbuilder/domain/CreateOrOverwriteFile.java   | 2 --
 .../org/jclouds/scriptbuilder/domain/CreateRunScript.java     | 2 --
 .../java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java  | 2 --
 .../java/org/jclouds/scriptbuilder/domain/InitMetadata.java   | 2 --
 .../jclouds/scriptbuilder/domain/InterpretableStatement.java  | 2 --
 .../org/jclouds/scriptbuilder/domain/JavaInitMetadata.java    | 1 -
 .../src/main/java/org/jclouds/scriptbuilder/domain/Kill.java  | 2 --
 .../org/jclouds/scriptbuilder/domain/LiteralStatement.java    | 2 --
 .../main/java/org/jclouds/scriptbuilder/domain/OsFamily.java  | 2 --
 .../org/jclouds/scriptbuilder/domain/PipeHttpResponseTo.java  | 2 --
 .../jclouds/scriptbuilder/domain/PipeHttpResponseToBash.java  | 2 --
 .../domain/PipeHttpResponseToTarxpzfIntoDirectory.java        | 2 --
 .../org/jclouds/scriptbuilder/domain/SaveHttpResponseTo.java  | 2 --
 .../java/org/jclouds/scriptbuilder/domain/ShellToken.java     | 2 --
 .../main/java/org/jclouds/scriptbuilder/domain/Statement.java | 2 --
 .../java/org/jclouds/scriptbuilder/domain/StatementList.java  | 2 --
 .../org/jclouds/scriptbuilder/domain/StatementVisitor.java    | 4 ----
 .../java/org/jclouds/scriptbuilder/domain/Statements.java     | 2 --
 .../scriptbuilder/domain/StoppableJavaInitMetadata.java       | 1 -
 .../main/java/org/jclouds/scriptbuilder/domain/SwitchArg.java | 2 --
 .../scriptbuilder/domain/UnzipHttpResponseIntoDirectory.java  | 2 --
 .../java/org/jclouds/scriptbuilder/domain/chef/DataBag.java   | 1 -
 .../main/java/org/jclouds/scriptbuilder/domain/chef/Role.java | 2 --
 .../java/org/jclouds/scriptbuilder/domain/chef/RunList.java   | 2 --
 .../functionloader/filters/LicenseHeaderFilter.java           | 3 ---
 .../scriptbuilder/functions/CredentialsFromAdminAccess.java   | 4 ----
 .../org/jclouds/scriptbuilder/functions/InitAdminAccess.java  | 4 ----
 .../org/jclouds/scriptbuilder/statements/chef/ChefSolo.java   | 1 -
 .../scriptbuilder/statements/chef/InstallChefGems.java        | 1 -
 .../statements/chef/InstallChefUsingOmnibus.java              | 1 -
 .../jclouds/scriptbuilder/statements/git/CloneGitRepo.java    | 2 --
 .../org/jclouds/scriptbuilder/statements/git/InstallGit.java  | 2 --
 .../org/jclouds/scriptbuilder/statements/java/InstallJDK.java | 2 --
 .../jclouds/scriptbuilder/statements/login/AdminAccess.java   | 2 --
 .../statements/login/AdminAccessBuilderSpec.java              | 1 -
 .../statements/login/ReplaceShadowPasswordEntry.java          | 2 --
 .../login/ReplaceShadowPasswordEntryOfLoginUser.java          | 4 ----
 .../scriptbuilder/statements/login/ShadowStatements.java      | 2 --
 .../scriptbuilder/statements/login/SudoStatements.java        | 2 --
 .../org/jclouds/scriptbuilder/statements/login/Sudoers.java   | 2 --
 .../org/jclouds/scriptbuilder/statements/login/UserAdd.java   | 2 --
 .../jclouds/scriptbuilder/statements/ruby/InstallRuby.java    | 2 --
 .../scriptbuilder/statements/ruby/InstallRubyGems.java        | 2 --
 .../scriptbuilder/statements/ssh/AuthorizeRSAPublicKeys.java  | 4 ----
 .../scriptbuilder/statements/ssh/InstallRSAPrivateKey.java    | 4 ----
 .../jclouds/scriptbuilder/statements/ssh/SshStatements.java   | 2 --
 .../org/jclouds/scriptbuilder/statements/ssh/SshdConfig.java  | 2 --
 .../src/main/java/org/jclouds/scriptbuilder/util/Utils.java   | 2 --
 .../test/java/org/jclouds/scriptbuilder/EnvBuilderTest.java   | 2 --
 .../test/java/org/jclouds/scriptbuilder/InitScriptTest.java   | 2 --
 .../java/org/jclouds/scriptbuilder/ScriptBuilderTest.java     | 2 --
 .../java/org/jclouds/scriptbuilder/domain/AppendFileTest.java | 3 ---
 .../test/java/org/jclouds/scriptbuilder/domain/CallTest.java  | 3 ---
 .../scriptbuilder/domain/CreateOrOverwriteFileTest.java       | 3 ---
 .../org/jclouds/scriptbuilder/domain/CreateRunScriptTest.java | 3 ---
 .../jclouds/scriptbuilder/domain/PipeHttpResponseToTest.java  | 3 ---
 .../jclouds/scriptbuilder/domain/SaveHttpResponseToTest.java  | 3 ---
 .../java/org/jclouds/scriptbuilder/domain/ShellTokenTest.java | 3 ---
 .../org/jclouds/scriptbuilder/domain/StatementListTest.java   | 3 ---
 .../java/org/jclouds/scriptbuilder/domain/StatementsTest.java | 3 ---
 .../java/org/jclouds/scriptbuilder/domain/SwitchArgTest.java  | 3 ---
 .../domain/UnzipHttpResponseIntoDirectoryToTest.java          | 3 ---
 .../java/org/jclouds/scriptbuilder/domain/chef/RoleTest.java  | 2 --
 .../org/jclouds/scriptbuilder/domain/chef/RunListTest.java    | 2 --
 .../functions/CredentialsFromAdminAccessTest.java             | 3 ---
 .../jclouds/scriptbuilder/functions/InitAdminAccessTest.java  | 3 ---
 .../jclouds/scriptbuilder/statements/chef/ChefSoloTest.java   | 2 --
 .../scriptbuilder/statements/chef/InstallChefGemsTest.java    | 2 --
 .../statements/chef/InstallChefUsingOmnibusTest.java          | 2 --
 .../scriptbuilder/statements/git/CloneGitRepoTest.java        | 3 ---
 .../jclouds/scriptbuilder/statements/git/InstallGitTest.java  | 3 ---
 .../jclouds/scriptbuilder/statements/java/InstallJDKTest.java | 3 ---
 .../statements/login/AdminAccessBuilderSpecTest.java          | 2 --
 .../scriptbuilder/statements/login/AdminAccessTest.java       | 3 ---
 .../login/ReplaceShadowPasswordEntryOfLoginUserTest.java      | 3 ---
 .../statements/login/ReplaceShadowPasswordEntryTest.java      | 3 ---
 .../scriptbuilder/statements/login/SudoStatementsTest.java    | 3 ---
 .../scriptbuilder/statements/login/TestConfiguration.java     | 5 -----
 .../jclouds/scriptbuilder/statements/login/UserAddTest.java   | 3 ---
 .../scriptbuilder/statements/ruby/InstallRubyGemsTest.java    | 2 --
 .../scriptbuilder/statements/ruby/InstallRubyTest.java        | 2 --
 .../statements/ssh/AuthorizeRSAPublicKeyTest.java             | 3 ---
 .../statements/ssh/InstallRSAPrivateKeyTest.java              | 3 ---
 .../scriptbuilder/statements/ssh/SshStatementsTest.java       | 3 ---
 .../test/java/org/jclouds/scriptbuilder/util/UtilsTest.java   | 3 ---
 .../src/main/java/org/jclouds/servermanager/Datacenter.java   | 2 --
 .../src/main/java/org/jclouds/servermanager/Hardware.java     | 2 --
 .../src/main/java/org/jclouds/servermanager/Image.java        | 2 --
 .../src/main/java/org/jclouds/servermanager/Server.java       | 2 --
 .../main/java/org/jclouds/servermanager/ServerManager.java    | 2 --
 .../org/jclouds/servermanager/ServerManagerApiMetadata.java   | 2 --
 .../config/ServerManagerComputeServiceContextModule.java      | 4 ----
 .../servermanager/compute/functions/DatacenterToLocation.java | 3 ---
 .../compute/functions/ServerManagerHardwareToHardware.java    | 3 ---
 .../compute/functions/ServerManagerImageToImage.java          | 3 ---
 .../servermanager/compute/functions/ServerToNodeMetadata.java | 3 ---
 .../compute/strategy/ServerManagerComputeServiceAdapter.java  | 1 -
 .../ServerManagerComputeServiceContextBuilderTest.java        | 5 -----
 .../compute/ServerManagerComputeServiceLiveTest.java          | 3 ---
 .../compute/ServerManagerExperimentLiveTest.java              | 4 ----
 4416 files changed, 1 insertion(+), 11639 deletions(-)
----------------------------------------------------------------------