You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2014/12/23 05:27:15 UTC
[51/51] [partial] stratos git commit: dropping jclouds 1.8.0 clone
dropping jclouds 1.8.0 clone
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a9834e9e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a9834e9e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a9834e9e
Branch: refs/heads/master
Commit: a9834e9ec1c7c9056fb36dbfcf18bc3fd73087bc
Parents: f97428f
Author: R-Rajkumar <rr...@gmail.com>
Authored: Tue Dec 23 09:55:48 2014 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Tue Dec 23 09:55:48 2014 +0530
----------------------------------------------------------------------
.../jclouds/apis/ec2/1.8.0-stratos/README.txt | 15 -
.../jclouds/apis/ec2/1.8.0-stratos/pom.xml | 144 ---
.../src/main/clojure/org/jclouds/ec2/ami2.clj | 84 --
.../src/main/clojure/org/jclouds/ec2/ebs2.clj | 286 -----
.../clojure/org/jclouds/ec2/elastic_ip2.clj | 80 --
.../clojure/org/jclouds/ec2/security_group2.clj | 99 --
.../src/main/java/org/jclouds/ec2/EC2Api.java | 165 ---
.../java/org/jclouds/ec2/EC2ApiMetadata.java | 91 --
.../main/java/org/jclouds/ec2/EC2Fallbacks.java | 50 -
...ndBlockDeviceMappingToIndexedFormParams.java | 63 -
.../BindBundleIdsToIndexedFormParams.java | 35 -
.../binders/BindFiltersToIndexedFormParams.java | 55 -
.../BindGroupIdsToIndexedFormParams.java | 35 -
.../BindGroupNamesToIndexedFormParams.java | 35 -
.../BindInstanceIdsToIndexedFormParams.java | 35 -
.../BindIpPermissionToIndexedFormParams.java | 37 -
.../BindIpPermissionsToIndexedFormParams.java | 45 -
.../BindKeyNamesToIndexedFormParams.java | 35 -
.../BindProductCodesToIndexedFormParams.java | 35 -
.../BindPublicIpsToIndexedFormParams.java | 40 -
.../BindResourceIdsToIndexedFormParams.java | 38 -
.../binders/BindS3UploadPolicyAndSignature.java | 53 -
.../binders/BindTagKeysToIndexedFormParams.java | 44 -
.../binders/BindTagsToIndexedFormParams.java | 51 -
.../BindUserGroupsToIndexedFormParams.java | 50 -
...roupPairToSourceSecurityGroupFormParams.java | 47 -
.../binders/BindUserIdsToIndexedFormParams.java | 35 -
.../BindVolumeIdsToIndexedFormParams.java | 35 -
...fNotNullBindAvailabilityZoneToFormParam.java | 53 -
.../jclouds/ec2/compute/EC2ComputeService.java | 328 -----
.../ec2/compute/EC2ComputeServiceContext.java | 29 -
.../config/EC2BindComputeStrategiesByClass.java | 94 --
.../config/EC2BindComputeSuppliersByClass.java | 38 -
.../config/EC2ComputeServiceContextModule.java | 142 ---
.../EC2ComputeServiceDependenciesModule.java | 193 ---
.../compute/config/EC2ResolveImagesModule.java | 33 -
.../ec2/compute/domain/EC2HardwareBuilder.java | 608 ---------
.../domain/PasswordDataAndPrivateKey.java | 74 --
.../ec2/compute/domain/RegionAndName.java | 107 --
.../domain/RegionNameAndIngressRules.java | 40 -
.../compute/extensions/EC2ImageExtension.java | 140 ---
.../extensions/EC2SecurityGroupExtension.java | 378 ------
.../functions/AddElasticIpsToNodemetadata.java | 75 --
.../compute/functions/CreateUniqueKeyPair.java | 75 --
.../functions/CredentialsForInstance.java | 75 --
.../ec2/compute/functions/EC2ImageParser.java | 145 ---
.../functions/EC2SecurityGroupIdFromName.java | 48 -
.../EC2SecurityGroupToSecurityGroup.java | 96 --
.../functions/ImagesToRegionAndIdMap.java | 52 -
.../PasswordCredentialsFromWindowsInstance.java | 119 --
.../ec2/compute/functions/PresentInstances.java | 82 --
.../RunningInstanceToNodeMetadata.java | 254 ----
...indowsLoginCredentialsFromEncryptedData.java | 77 --
.../internal/EC2ComputeServiceContextImpl.java | 44 -
.../internal/EC2TemplateBuilderImpl.java | 116 --
.../loaders/CreateSecurityGroupIfNeeded.java | 102 --
.../loaders/LoadPublicIpForInstanceOrNull.java | 57 -
.../ec2/compute/loaders/RegionAndIdToImage.java | 64 -
.../ec2/compute/options/EC2TemplateOptions.java | 686 ----------
.../compute/predicates/EC2ImagePredicates.java | 48 -
.../predicates/SecurityGroupPresent.java | 64 -
...curityGroupsAsNeededAndReturnRunOptions.java | 199 ---
.../strategy/DescribeImagesParallel.java | 82 --
.../EC2CreateNodesInGroupThenAddToSet.java | 252 ----
.../strategy/EC2DestroyNodeStrategy.java | 101 --
.../compute/strategy/EC2GetImageStrategy.java | 66 -
.../strategy/EC2GetNodeMetadataStrategy.java | 67 -
.../compute/strategy/EC2ListNodesStrategy.java | 160 ---
...DefaultLoginCredentialsForImageStrategy.java | 72 --
.../compute/strategy/EC2RebootNodeStrategy.java | 49 -
.../compute/strategy/EC2ResumeNodeStrategy.java | 49 -
.../strategy/EC2SuspendNodeStrategy.java | 49 -
.../ec2/compute/strategy/ReviseParsedImage.java | 40 -
.../compute/suppliers/EC2HardwareSupplier.java | 42 -
.../ec2/compute/suppliers/EC2ImageSupplier.java | 116 --
.../suppliers/RegionAndNameToImageSupplier.java | 49 -
.../ec2/compute/util/EC2ComputeUtils.java | 31 -
.../ec2/config/BaseEC2HttpApiModule.java | 59 -
.../jclouds/ec2/config/EC2HttpApiModule.java | 35 -
.../java/org/jclouds/ec2/domain/Attachment.java | 225 ----
.../ec2/domain/AvailabilityZoneInfo.java | 128 --
.../org/jclouds/ec2/domain/BlockDevice.java | 108 --
.../jclouds/ec2/domain/BlockDeviceMapping.java | 292 -----
.../ec2/domain/BundleInstanceS3Storage.java | 149 ---
.../java/org/jclouds/ec2/domain/BundleTask.java | 293 -----
.../java/org/jclouds/ec2/domain/Hypervisor.java | 47 -
.../main/java/org/jclouds/ec2/domain/Image.java | 530 --------
.../org/jclouds/ec2/domain/ImageAttribute.java | 96 --
.../org/jclouds/ec2/domain/InstanceState.java | 95 --
.../jclouds/ec2/domain/InstanceStateChange.java | 118 --
.../org/jclouds/ec2/domain/InstanceType.java | 386 ------
.../java/org/jclouds/ec2/domain/KeyPair.java | 205 ---
.../org/jclouds/ec2/domain/PasswordData.java | 151 ---
.../java/org/jclouds/ec2/domain/Permission.java | 92 --
.../ec2/domain/PublicIpInstanceIdPair.java | 110 --
.../org/jclouds/ec2/domain/Reservation.java | 227 ----
.../ec2/domain/ReservedInstancesOffering.java | 181 ---
.../org/jclouds/ec2/domain/RootDeviceType.java | 46 -
.../org/jclouds/ec2/domain/RunningInstance.java | 524 --------
.../org/jclouds/ec2/domain/SecurityGroup.java | 228 ----
.../java/org/jclouds/ec2/domain/Snapshot.java | 234 ----
.../java/org/jclouds/ec2/domain/Subnet.java | 250 ----
.../main/java/org/jclouds/ec2/domain/Tag.java | 194 ---
.../org/jclouds/ec2/domain/UserIdGroupPair.java | 99 --
.../jclouds/ec2/domain/VirtualizationType.java | 45 -
.../java/org/jclouds/ec2/domain/Volume.java | 352 ------
.../java/org/jclouds/ec2/features/AMIApi.java | 364 ------
.../features/AvailabilityZoneAndRegionApi.java | 88 --
.../ec2/features/ElasticBlockStoreApi.java | 631 ----------
.../ec2/features/ElasticIPAddressApi.java | 198 ---
.../org/jclouds/ec2/features/InstanceApi.java | 801 ------------
.../org/jclouds/ec2/features/KeyPairApi.java | 157 ---
.../jclouds/ec2/features/SecurityGroupApi.java | 322 -----
.../org/jclouds/ec2/features/SubnetApi.java | 92 --
.../java/org/jclouds/ec2/features/TagApi.java | 200 ---
.../org/jclouds/ec2/features/WindowsApi.java | 228 ----
...vertUnencodedBytesToBase64EncodedString.java | 41 -
.../functions/EncodedRSAPublicKeyToBase64.java | 50 -
.../options/BundleInstanceS3StorageOptions.java | 94 --
.../jclouds/ec2/options/CreateImageOptions.java | 93 --
.../ec2/options/CreateSnapshotOptions.java | 69 -
.../ec2/options/CreateVolumeOptions.java | 146 ---
.../DescribeAvailabilityZonesOptions.java | 67 -
.../ec2/options/DescribeImagesOptions.java | 114 --
.../ec2/options/DescribeRegionsOptions.java | 67 -
.../ec2/options/DescribeSnapshotsOptions.java | 108 --
.../ec2/options/DetachVolumeOptions.java | 85 --
.../RegisterImageBackedByEbsOptions.java | 345 -----
.../ec2/options/RegisterImageOptions.java | 127 --
.../ec2/options/RunInstancesOptions.java | 229 ----
.../options/internal/BaseEC2RequestOptions.java | 55 -
.../ec2/predicates/InstanceHasIpAddress.java | 64 -
.../ec2/predicates/InstanceStateRunning.java | 67 -
.../ec2/predicates/InstanceStateStopped.java | 60 -
.../ec2/predicates/InstanceStateTerminated.java | 66 -
.../ec2/predicates/SnapshotCompleted.java | 58 -
.../jclouds/ec2/predicates/VolumeAttached.java | 61 -
.../jclouds/ec2/predicates/VolumeAvailable.java | 55 -
.../jclouds/ec2/predicates/VolumeDetached.java | 67 -
.../org/jclouds/ec2/reference/EC2Constants.java | 50 -
.../DescribeAvailabilityZonesInRegion.java | 92 --
.../suppliers/DescribeRegionsForRegionURIs.java | 50 -
.../org/jclouds/ec2/util/IpPermissions.java | 195 ---
.../jclouds/ec2/util/SubnetFilterBuilder.java | 249 ----
.../org/jclouds/ec2/util/TagFilterBuilder.java | 222 ----
.../main/java/org/jclouds/ec2/util/Tags.java | 97 --
.../ec2/xml/AllocateAddressResponseHandler.java | 53 -
.../org/jclouds/ec2/xml/AttachmentHandler.java | 82 --
.../jclouds/ec2/xml/BaseReservationHandler.java | 213 ----
.../ec2/xml/BlockDeviceMappingHandler.java | 78 --
.../jclouds/ec2/xml/BooleanValueHandler.java | 45 -
.../org/jclouds/ec2/xml/BundleTaskHandler.java | 107 --
.../ec2/xml/CreateVolumeResponseHandler.java | 207 ---
.../xml/DescribeAddressesResponseHandler.java | 76 --
...escribeAvailabilityZonesResponseHandler.java | 100 --
.../xml/DescribeBundleTasksResponseHandler.java | 70 --
.../ec2/xml/DescribeImagesResponseHandler.java | 232 ----
.../xml/DescribeInstancesResponseHandler.java | 108 --
.../xml/DescribeKeyPairsResponseHandler.java | 83 --
.../ec2/xml/DescribeRegionsResponseHandler.java | 63 -
.../DescribeSecurityGroupsResponseHandler.java | 125 --
.../xml/DescribeSnapshotsResponseHandler.java | 73 --
.../ec2/xml/DescribeSubnetsResponseHandler.java | 88 --
.../ec2/xml/DescribeTagsResponseHandler.java | 97 --
.../ec2/xml/DescribeVolumesResponseHandler.java | 76 --
.../xml/GetConsoleOutputResponseHandler.java | 54 -
.../ec2/xml/GetPasswordDataResponseHandler.java | 58 -
.../org/jclouds/ec2/xml/ImageIdHandler.java | 48 -
...nstanceInitiatedShutdownBehaviorHandler.java | 47 -
.../ec2/xml/InstanceStateChangeHandler.java | 111 --
.../jclouds/ec2/xml/InstanceTypeHandler.java | 46 -
.../jclouds/ec2/xml/IpPermissionHandler.java | 90 --
.../jclouds/ec2/xml/KeyPairResponseHandler.java | 78 --
.../org/jclouds/ec2/xml/PermissionHandler.java | 54 -
.../ec2/xml/RunInstancesResponseHandler.java | 47 -
.../jclouds/ec2/xml/SecurityGroupHandler.java | 140 ---
.../org/jclouds/ec2/xml/SnapshotHandler.java | 103 --
.../org/jclouds/ec2/xml/StringValueHandler.java | 46 -
.../java/org/jclouds/ec2/xml/SubnetHandler.java | 92 --
.../java/org/jclouds/ec2/xml/TagHandler.java | 75 --
.../java/org/jclouds/ec2/xml/TagSetHandler.java | 75 --
.../ec2/xml/UnencodeStringValueHandler.java | 36 -
.../services/org.jclouds.apis.ApiMetadata | 1 -
...dApplicationArchitecturesEC2ApiLiveTest.java | 425 -------
.../org/jclouds/ec2/EBSBootEC2ApiLiveTest.java | 605 ---------
.../org/jclouds/ec2/EC2ApiMetadataTest.java | 28 -
.../org/jclouds/ec2/EC2ContextBuilderText.java | 33 -
...ockDeviceMappingToIndexedFormParamsTest.java | 68 -
.../BindBundleIdsToIndexedFormParamsTest.java | 55 -
.../BindFiltersToIndexedFormParamsTest.java | 61 -
.../BindGroupNamesToIndexedFormParamsTest.java | 55 -
.../BindInstanceIdsToIndexedFormParamsTest.java | 55 -
.../BindKeyNamesToIndexedFormParamsTest.java | 55 -
...BindProductCodesToIndexedFormParamsTest.java | 56 -
.../BindPublicIpsToIndexedFormParamsTest.java | 55 -
.../BindResourceIdsToIndexedFormParamsTest.java | 55 -
.../BindS3UploadPolicyAndSignatureTest.java | 59 -
.../BindTagKeysToIndexedFormParamsTest.java | 52 -
.../BindTagsToIndexedFormParamsTest.java | 60 -
.../BindUserGroupsToIndexedFormParamsTest.java | 61 -
...PairToSourceSecurityGroupFormParamsTest.java | 58 -
.../BindUserIdsToIndexedFormParamsTest.java | 56 -
.../BindVolumeIdsToIndexedFormParamsTest.java | 55 -
...NullBindAvailabilityZoneToFormParamTest.java | 57 -
.../compute/EC2ComputeServiceExpectTest.java | 319 -----
.../ec2/compute/EC2ComputeServiceLiveTest.java | 365 ------
.../ec2/compute/EC2TemplateBuilderLiveTest.java | 94 --
.../ec2/compute/EC2TemplateBuilderTest.java | 242 ----
.../compute/TestCanRecreateGroupLiveTest.java | 53 -
.../EC2ComputeServiceContextModuleTest.java | 62 -
.../extensions/EC2ImageExtensionExpectTest.java | 80 --
.../extensions/EC2ImageExtensionLiveTest.java | 61 -
.../EC2SecurityGroupExtensionExpectTest.java | 579 ---------
.../EC2SecurityGroupExtensionLiveTest.java | 33 -
.../AddElasticIpsToNodemetadataTest.java | 87 --
.../functions/CreateUniqueKeyPairTest.java | 113 --
.../compute/functions/EC2ImageParserTest.java | 121 --
.../EC2SecurityGroupToSecurityGroupTest.java | 80 --
.../compute/functions/PresentInstancesTest.java | 66 -
.../RunningInstanceToNodeMetadataTest.java | 295 -----
...wsLoginCredentialsFromEncryptedDataTest.java | 74 --
.../BaseEC2ComputeServiceContextExpectTest.java | 42 -
.../BaseEC2ComputeServiceExpectTest.java | 296 -----
.../internal/EC2TemplateBuilderImplTest.java | 230 ----
.../CreateSecurityGroupIfNeededTest.java | 105 --
.../LoadPublicIpForInstanceOrNullTest.java | 103 --
.../compute/loaders/RegionAndIdToImageTest.java | 140 ---
.../compute/options/EC2TemplateOptionsTest.java | 325 -----
...tyGroupsAsNeededAndReturnRunOptionsTest.java | 575 ---------
.../EC2CreateNodesInGroupThenAddToSetTest.java | 340 -----
.../strategy/EC2DestroyNodeStrategyTest.java | 186 ---
.../ec2/config/EC2HttpApiModuleExpectTest.java | 142 ---
.../jclouds/ec2/features/AMIApiExpectTest.java | 73 --
.../jclouds/ec2/features/AMIApiLiveTest.java | 266 ----
.../org/jclouds/ec2/features/AMIApiTest.java | 519 --------
.../AvailabilityZoneAndRegionApiLiveTest.java | 89 --
.../AvailabilityZoneAndRegionApiTest.java | 114 --
.../jclouds/ec2/features/BaseEC2ApiTest.java | 142 ---
.../EC2ElasticBlockStoreApiExpectTest.java | 204 ---
.../features/ElasticBlockStoreApiLiveTest.java | 311 -----
.../ec2/features/ElasticBlockStoreApiTest.java | 399 ------
.../features/ElasticIPAddressApiExpectTest.java | 101 --
.../features/ElasticIPAddressApiLiveTest.java | 75 --
.../ec2/features/ElasticIPAddressApiTest.java | 138 --
.../ec2/features/InstanceApiExpectTest.java | 100 --
.../ec2/features/InstanceApiLiveTest.java | 95 --
.../jclouds/ec2/features/InstanceApiTest.java | 591 ---------
.../ec2/features/KeyPairApiExpectTest.java | 73 --
.../ec2/features/KeyPairApiLiveTest.java | 141 ---
.../jclouds/ec2/features/KeyPairApiTest.java | 86 --
.../features/SecurityGroupApiExpectTest.java | 73 --
.../ec2/features/SecurityGroupApiLiveTest.java | 332 -----
.../ec2/features/SecurityGroupApiTest.java | 234 ----
.../ec2/features/SubnetApiExpectTest.java | 116 --
.../jclouds/ec2/features/SubnetApiLiveTest.java | 81 --
.../jclouds/ec2/features/TagApiExpectTest.java | 282 -----
.../ec2/features/WindowsApiExpectTest.java | 112 --
.../ec2/features/WindowsApiLiveTest.java | 34 -
.../jclouds/ec2/features/WindowsApiTest.java | 160 ---
.../features/internal/BaseTagApiLiveTest.java | 157 ---
...UnencodedBytesToBase64EncodedStringTest.java | 42 -
.../EncodedRSAPublicKeyToBase64Test.java | 42 -
.../ec2/internal/BaseEC2ApiExpectTest.java | 67 -
.../ec2/internal/BaseEC2ApiLiveTest.java | 26 -
.../jclouds/ec2/internal/BaseEC2ExpectTest.java | 85 --
.../BundleInstanceS3StorageOptionsTest.java | 72 --
.../ec2/options/CreateImageOptionsTest.java | 78 --
.../ec2/options/CreateSnapshotOptionsTest.java | 64 -
.../ec2/options/CreateVolumeOptionsTest.java | 156 ---
.../ec2/options/DescribeImagesOptionsTest.java | 132 --
.../options/DescribeSnapshotsOptionsTest.java | 127 --
.../ec2/options/DetachVolumeOptionsTest.java | 89 --
.../RegisterImageBackedByEbsOptionsTest.java | 396 ------
.../ec2/options/RegisterImageOptionsTest.java | 144 ---
.../ec2/options/RunInstancesOptionsTest.java | 264 ----
.../ec2/parse/DescribeSubnetsResponseTest.java | 67 -
.../ec2/parse/DescribeTagsResponseTest.java | 71 --
.../ec2/parse/GetPasswordDataResponseTest.java | 52 -
.../ec2/predicates/VolumeDetachedTest.java | 109 --
.../DescribeAvailabilityZonesInRegionTest.java | 122 --
.../org/jclouds/ec2/util/IpPermissionsTest.java | 104 --
.../java/org/jclouds/ec2/util/TagsTest.java | 52 -
.../xml/AllocateAddressResponseHandlerTest.java | 42 -
.../jclouds/ec2/xml/AttachmentHandlerTest.java | 51 -
.../org/jclouds/ec2/xml/BaseEC2HandlerTest.java | 82 --
.../ec2/xml/BlockDeviceMappingHandlerTest.java | 55 -
.../jclouds/ec2/xml/BundleTaskHandlerTest.java | 66 -
.../xml/CreateVolumeResponseHandlerTest.java | 58 -
.../DescribeAddressesResponseHandlerTest.java | 55 -
...ibeAvailabilityZonesResponseHandlerTest.java | 83 --
.../DescribeBundleTasksResponseHandlerTest.java | 54 -
.../xml/DescribeImagesResponseHandlerTest.java | 155 ---
.../ec2/xml/DescribeInstanceAttributeTest.java | 78 --
.../DescribeInstancesResponseHandlerTest.java | 171 ---
.../DescribeKeyPairsResponseHandlerTest.java | 51 -
.../xml/DescribeRegionsResponseHandlerTest.java | 134 --
...scribeSecurityGroupsResponseHandlerTest.java | 87 --
.../DescribeSnapshotsResponseHandlerTest.java | 57 -
.../xml/DescribeVolumesResponseHandlerTest.java | 66 -
.../GetConsoleOutputResponseHandlerTest.java | 53 -
.../ec2/xml/InstanceStateChangeHandlerTest.java | 91 --
.../ec2/xml/KeyPairResponseHandlerTest.java | 78 --
.../jclouds/ec2/xml/PermissionHandlerTest.java | 46 -
.../xml/RunInstancesResponseHandlerTest.java | 108 --
.../jclouds/ec2/xml/SnapshotHandlerTest.java | 51 -
.../src/test/resources/allocate_address.xml | 3 -
.../src/test/resources/amzn_images.xml | 113 --
.../1.8.0-stratos/src/test/resources/attach.xml | 7 -
...authorize_securitygroup_ingress_response.xml | 4 -
.../availabilityZones-ap-northeast-1.xml | 17 -
.../availabilityZones-ap-southeast-1.xml | 17 -
.../resources/availabilityZones-eu-west-1.xml | 23 -
.../resources/availabilityZones-sa-east-1.xml | 17 -
.../resources/availabilityZones-us-east-1.xml | 35 -
.../resources/availabilityZones-us-west-1.xml | 23 -
.../resources/availabilityZones-us-west-2.xml | 23 -
.../src/test/resources/availabilityZones.xml | 35 -
.../src/test/resources/bundle_instance.xml | 18 -
.../src/test/resources/cancel_bundle_task.xml | 16 -
.../src/test/resources/create_keypair.xml | 28 -
.../test/resources/created_securitygroup.xml | 6 -
.../src/test/resources/created_snapshot.xml | 10 -
.../src/test/resources/created_volume.xml | 12 -
.../src/test/resources/delete_securitygroup.xml | 4 -
.../src/test/resources/describe_addresses.xml | 11 -
.../resources/describe_addresses_single.xml | 8 -
.../test/resources/describe_bundle_tasks.xml | 18 -
...cribe_image_attribute_blockDeviceMapping.xml | 24 -
...escribe_image_attribute_launchPermission.xml | 11 -
.../src/test/resources/describe_images.xml | 23 -
.../src/test/resources/describe_images_ebs.xml | 44 -
.../describe_images_imageextension0.xml | 24 -
.../describe_images_imageextension1.xml | 24 -
.../describe_images_imageextension2.xml | 24 -
.../src/test/resources/describe_images_nova.xml | 21 -
.../src/test/resources/describe_images_tags.xml | 33 -
.../test/resources/describe_images_windows.xml | 22 -
.../src/test/resources/describe_instances.xml | 85 --
.../test/resources/describe_instances_ebs.xml | 63 -
.../resources/describe_instances_multiple.xml | 130 --
.../resources/describe_instances_running-1.xml | 74 --
.../describe_instances_running-named.xml | 186 ---
.../resources/describe_instances_running.xml | 45 -
...escribe_instances_running_securitygroups.xml | 74 --
.../resources/describe_instances_three_ids.xml | 74 --
.../src/test/resources/describe_keypairs.xml | 8 -
.../test/resources/describe_securitygroups.xml | 39 -
.../resources/describe_securitygroups_empty.xml | 41 -
.../describe_securitygroups_extension_cidr.xml | 24 -
.../describe_securitygroups_extension_group.xml | 26 -
.../describe_securitygroups_extension_new.xml | 27 -
...describe_securitygroups_extension_single.xml | 12 -
.../src/test/resources/describe_snapshots.xml | 20 -
.../src/test/resources/describe_subnets.xml | 33 -
.../src/test/resources/describe_tags.xml | 29 -
.../src/test/resources/describe_volumes.xml | 38 -
.../test/resources/describe_volumes_single.xml | 18 -
.../test/resources/disableApiTermination.xml | 8 -
.../resources/get_console_output_response.xml | 13 -
.../src/test/resources/get_passworddata.xml | 6 -
.../instanceInitiatedShutdownBehavior.xml | 7 -
.../src/test/resources/instanceType.xml | 9 -
.../1.8.0-stratos/src/test/resources/log4j.xml | 166 ---
.../src/test/resources/new_instance.xml | 56 -
.../src/test/resources/new_securitygroup.xml | 14 -
.../src/test/resources/ramdisk.xml | 8 -
.../resources/regionEndpoints-additional.xml | 22 -
.../src/test/resources/regionEndpoints-all.xml | 34 -
.../src/test/resources/regionEndpoints.xml | 18 -
.../src/test/resources/run_instances.xml | 74 --
.../resources/run_instances_cloudbridge.xml | 68 -
.../src/test/resources/run_instances_three.xml | 74 --
.../src/test/resources/start_instances.xml | 15 -
.../src/test/resources/stop_instances.xml | 15 -
.../src/test/resources/terminate_instances.xml | 15 -
.../src/test/resources/userData.xml | 8 -
.../jclouds/apis/gce/1.8.0-stratos/README.txt | 77 --
.../jclouds/apis/gce/1.8.0-stratos/pom.xml | 135 --
.../GoogleComputeEngineApi.java | 185 ---
.../GoogleComputeEngineApiMetadata.java | 104 --
.../GoogleComputeEngineConstants.java | 81 --
.../compute/GoogleComputeEngineService.java | 200 ---
.../GoogleComputeEngineServiceAdapter.java | 439 -------
...GoogleComputeEngineServiceContextModule.java | 283 -----
...ogleComputeEngineSecurityGroupExtension.java | 338 -----
.../functions/BuildInstanceMetadata.java | 46 -
.../functions/FirewallTagNamingConvention.java | 62 -
.../functions/FirewallToIpPermission.java | 87 --
.../GoogleComputeEngineImageToImage.java | 80 --
.../functions/InstanceInZoneToNodeMetadata.java | 150 ---
.../functions/MachineTypeInZoneToHardware.java | 100 --
.../functions/NetworkToSecurityGroup.java | 82 --
.../functions/OrphanedGroupsFromDeadNodes.java | 57 -
.../compute/functions/RegionToLocation.java | 45 -
.../compute/functions/ZoneToLocation.java | 45 -
.../compute/loaders/FindNetworkOrCreate.java | 62 -
.../GoogleComputeEngineTemplateOptions.java | 382 ------
.../predicates/AllNodesInGroupTerminated.java | 48 -
...desWithGroupEncodedIntoNameThenAddToSet.java | 183 ---
...DefaultLoginCredentialsForImageStrategy.java | 69 -
...eNodeCredentialsButOverrideFromTemplate.java | 57 -
.../GoogleComputeEngineHttpApiModule.java | 177 ---
.../config/GoogleComputeEngineParserModule.java | 413 ------
.../config/OAuthModuleWithoutTypeAdapters.java | 51 -
.../googlecomputeengine/config/UserProject.java | 33 -
.../domain/AbstractDisk.java | 121 --
.../googlecomputeengine/domain/Address.java | 177 ---
.../googlecomputeengine/domain/Deprecated.java | 195 ---
.../googlecomputeengine/domain/Disk.java | 123 --
.../googlecomputeengine/domain/Firewall.java | 379 ------
.../googlecomputeengine/domain/Image.java | 286 -----
.../googlecomputeengine/domain/Instance.java | 1187 ------------------
.../domain/InstanceInZone.java | 52 -
.../domain/InstanceTemplate.java | 445 -------
.../googlecomputeengine/domain/ListPage.java | 179 ---
.../googlecomputeengine/domain/MachineType.java | 360 ------
.../domain/MachineTypeInZone.java | 52 -
.../googlecomputeengine/domain/Metadata.java | 139 --
.../googlecomputeengine/domain/Network.java | 133 --
.../googlecomputeengine/domain/Operation.java | 556 --------
.../googlecomputeengine/domain/Project.java | 162 ---
.../googlecomputeengine/domain/Quota.java | 152 ---
.../googlecomputeengine/domain/Region.java | 175 ---
.../googlecomputeengine/domain/Resource.java | 283 -----
.../googlecomputeengine/domain/Route.java | 433 -------
.../domain/SlashEncodedIds.java | 83 --
.../googlecomputeengine/domain/Snapshot.java | 135 --
.../googlecomputeengine/domain/Zone.java | 334 -----
.../domain/internal/NetworkAndAddressRange.java | 91 --
.../features/AddressApi.java | 187 ---
.../googlecomputeengine/features/DiskApi.java | 255 ----
.../features/FirewallApi.java | 227 ----
.../features/GlobalOperationApi.java | 158 ---
.../googlecomputeengine/features/ImageApi.java | 167 ---
.../features/InstanceApi.java | 381 ------
.../features/MachineTypeApi.java | 143 ---
.../features/NetworkApi.java | 204 ---
.../features/ProjectApi.java | 96 --
.../googlecomputeengine/features/RegionApi.java | 135 --
.../features/RegionOperationApi.java | 163 ---
.../googlecomputeengine/features/RouteApi.java | 184 ---
.../features/SnapshotApi.java | 160 ---
.../googlecomputeengine/features/ZoneApi.java | 135 --
.../features/ZoneOperationApi.java | 163 ---
.../functions/CreateNetworkIfNeeded.java | 100 --
.../functions/internal/BaseToPagedIterable.java | 66 -
.../internal/BaseWithRegionToPagedIterable.java | 72 --
.../internal/BaseWithZoneToPagedIterable.java | 72 --
.../functions/internal/PATCH.java | 35 -
.../functions/internal/ParseAddresses.java | 67 -
.../functions/internal/ParseDisks.java | 67 -
.../functions/internal/ParseFirewalls.java | 63 -
.../internal/ParseGlobalOperations.java | 63 -
.../functions/internal/ParseImages.java | 63 -
.../functions/internal/ParseInstances.java | 65 -
.../functions/internal/ParseMachineTypes.java | 64 -
.../functions/internal/ParseNetworks.java | 63 -
.../internal/ParseRegionOperations.java | 65 -
.../functions/internal/ParseRegions.java | 63 -
.../functions/internal/ParseRoutes.java | 63 -
.../functions/internal/ParseSnapshots.java | 66 -
.../functions/internal/ParseZoneOperations.java | 65 -
.../functions/internal/ParseZones.java | 63 -
.../handlers/FirewallBinder.java | 56 -
.../GoogleComputeEngineErrorHandler.java | 62 -
.../handlers/InstanceBinder.java | 65 -
.../handlers/MetadataBinder.java | 60 -
.../handlers/RouteBinder.java | 56 -
.../options/AttachDiskOptions.java | 128 --
.../options/DeprecateOptions.java | 126 --
.../options/FirewallOptions.java | 166 ---
.../options/ListOptions.java | 91 --
.../options/RouteOptions.java | 202 ---
.../GlobalOperationDonePredicate.java | 59 -
.../predicates/InstancePredicates.java | 33 -
.../predicates/NetworkFirewallPredicates.java | 121 --
.../RegionOperationDonePredicate.java | 69 -
.../predicates/ZoneOperationDonePredicate.java | 68 -
.../java/org/jclouds/oauth/v2/OAuthApi.java | 63 -
.../org/jclouds/oauth/v2/OAuthApiMetadata.java | 80 --
.../org/jclouds/oauth/v2/OAuthConstants.java | 78 --
.../jclouds/oauth/v2/config/Authentication.java | 35 -
.../v2/config/OAuthAuthenticationModule.java | 52 -
.../oauth/v2/config/OAuthHttpApiModule.java | 45 -
.../jclouds/oauth/v2/config/OAuthModule.java | 86 --
.../oauth/v2/config/OAuthProperties.java | 43 -
.../jclouds/oauth/v2/config/OAuthScopes.java | 40 -
.../org/jclouds/oauth/v2/domain/ClaimSet.java | 191 ---
.../org/jclouds/oauth/v2/domain/Header.java | 128 --
.../oauth/v2/domain/OAuthCredentials.java | 129 --
.../java/org/jclouds/oauth/v2/domain/Token.java | 149 ---
.../jclouds/oauth/v2/domain/TokenRequest.java | 131 --
.../oauth/v2/domain/TokenRequestFormat.java | 45 -
.../oauth/v2/filters/OAuthAuthenticator.java | 63 -
.../oauth/v2/functions/BuildTokenRequest.java | 135 --
.../jclouds/oauth/v2/functions/FetchToken.java | 41 -
.../v2/functions/OAuthCredentialsSupplier.java | 125 --
.../v2/functions/SignOrProduceMacForToken.java | 119 --
.../oauth/v2/handlers/OAuthErrorHandler.java | 64 -
.../oauth/v2/handlers/OAuthTokenBinder.java | 45 -
.../oauth/v2/json/ClaimSetTypeAdapter.java | 59 -
.../oauth/v2/json/HeaderTypeAdapter.java | 52 -
.../oauth/v2/json/JWTTokenRequestFormat.java | 96 --
.../services/org.jclouds.apis.ApiMetadata | 19 -
.../GoogleComputeEngineApiMetadataTest.java | 38 -
...eEngineAuthenticatedRestContextLiveTest.java | 33 -
.../PageSystemExpectTest.java | 114 --
.../GoogleComputeEngineServiceExpectTest.java | 574 ---------
.../GoogleComputeEngineServiceLiveTest.java | 128 --
...uteEngineSecurityGroupExtensionLiveTest.java | 28 -
.../functions/FirewallToIpPermissionTest.java | 93 --
.../GoogleComputeEngineImageToImageTest.java | 60 -
.../InstanceInZoneToNodeMetadataTest.java | 286 -----
.../functions/NetworkToSecurityGroupTest.java | 94 --
.../OrphanedGroupsFromDeadNodesTest.java | 136 --
.../loaders/FindNetworkOrCreateTest.java | 141 ---
.../features/AddressApiExpectTest.java | 163 ---
.../features/AddressApiLiveTest.java | 71 --
.../features/DiskApiExpectTest.java | 226 ----
.../features/DiskApiLiveTest.java | 85 --
.../features/FirewallApiExpectTest.java | 301 -----
.../features/FirewallApiLiveTest.java | 163 ---
.../features/GlobalOperationApiExpectTest.java | 158 ---
.../features/GlobalOperationApiLiveTest.java | 91 --
.../features/ImageApiExpectTest.java | 159 ---
.../features/ImageApiLiveTest.java | 74 --
.../features/InstanceApiExpectTest.java | 410 ------
.../features/InstanceApiLiveTest.java | 240 ----
.../features/MachineTypeApiExpectTest.java | 113 --
.../features/MachineTypeApiLiveTest.java | 73 --
.../features/NetworkApiExpectTest.java | 164 ---
.../features/NetworkApiLiveTest.java | 83 --
.../features/ProjectApiExpectTest.java | 96 --
.../features/ProjectApiLiveTest.java | 123 --
.../features/RegionApiExpectTest.java | 94 --
.../features/RegionApiLiveTest.java | 74 --
.../features/RegionOperationApiExpectTest.java | 195 ---
.../features/RegionOperationApiLiveTest.java | 91 --
.../features/RouteApiExpectTest.java | 175 ---
.../features/RouteApiLiveTest.java | 96 --
.../features/SnapshotApiExpectTest.java | 94 --
.../features/SnapshotApiLiveTest.java | 92 --
.../features/ZoneApiExpectTest.java | 97 --
.../features/ZoneApiLiveTest.java | 74 --
.../features/ZoneOperationApiExpectTest.java | 193 ---
.../features/ZoneOperationApiLiveTest.java | 90 --
.../functions/CreateNetworkIfNeededTest.java | 132 --
.../GoogleComputeEngineErrorHandlerTest.java | 92 --
.../BaseGoogleComputeEngineApiExpectTest.java | 31 -
.../BaseGoogleComputeEngineApiLiveTest.java | 160 ---
.../BaseGoogleComputeEngineExpectTest.java | 195 ---
.../BaseGoogleComputeEngineParseTest.java | 33 -
...leComputeEngineServiceContextExpectTest.java | 49 -
...aseGoogleComputeEngineServiceExpectTest.java | 28 -
.../parse/ParseAddressListTest.java | 61 -
.../parse/ParseAddressTest.java | 51 -
.../parse/ParseDiskListTest.java | 61 -
.../parse/ParseDiskTest.java | 50 -
.../parse/ParseFirewallListTest.java | 68 -
.../parse/ParseFirewallTest.java | 60 -
.../parse/ParseImageListTest.java | 71 --
.../parse/ParseImageTest.java | 55 -
.../parse/ParseInstanceListTest.java | 48 -
.../parse/ParseInstanceSerialOutputTest.java | 38 -
.../parse/ParseInstanceTest.java | 81 --
.../parse/ParseMachineTypeListTest.java | 94 --
.../parse/ParseMachineTypeTest.java | 57 -
.../parse/ParseMetadataTest.java | 45 -
.../parse/ParseNetworkListTest.java | 49 -
.../parse/ParseNetworkTest.java | 48 -
.../parse/ParseOperationListTest.java | 46 -
.../parse/ParseOperationTest.java | 58 -
.../parse/ParseProjectTest.java | 67 -
.../parse/ParseQuotaTest.java | 39 -
.../parse/ParseRegionListTest.java | 72 --
.../parse/ParseRegionTest.java | 62 -
.../parse/ParseRouteListTest.java | 62 -
.../parse/ParseRouteTest.java | 56 -
.../parse/ParseSnapshotListTest.java | 64 -
.../parse/ParseSnapshotTest.java | 52 -
.../parse/ParseZoneListTest.java | 70 --
.../parse/ParseZoneTest.java | 55 -
.../NetworkFirewallPredicatesTest.java | 162 ---
.../jclouds/oauth/v2/OAuthApiMetadataTest.java | 38 -
.../org/jclouds/oauth/v2/OAuthTestUtils.java | 75 --
.../oauth/v2/features/OAuthApiExpectTest.java | 99 --
.../oauth/v2/features/OAuthApiLiveTest.java | 80 --
.../functions/OAuthCredentialsFromPKTest.java | 61 -
.../functions/OAuthCredentialsSupplierTest.java | 55 -
.../oauth/v2/functions/SignerFunctionTest.java | 61 -
.../v2/handlers/OAuthErrorHandlerTest.java | 92 --
.../oauth/v2/internal/Base64UrlSafeTest.java | 40 -
.../v2/internal/BaseOAuthApiExpectTest.java | 23 -
.../oauth/v2/internal/BaseOAuthApiLiveTest.java | 56 -
.../BaseOAuthAuthenticatedApiLiveTest.java | 110 --
.../oauth/v2/internal/BaseOAuthExpectTest.java | 26 -
.../v2/json/JWTTokenRequestFormatTest.java | 69 -
.../jclouds/oauth/v2/parse/ParseTokenTest.java | 40 -
.../firewall_list.json | 37 -
.../network_get.json | 10 -
.../src/test/resources/address_get.json | 12 -
.../src/test/resources/address_insert.json | 1 -
.../src/test/resources/address_list.json | 31 -
.../test/resources/disk_create_snapshot.json | 1 -
.../src/test/resources/disk_get.json | 10 -
.../src/test/resources/disk_insert.json | 1 -
.../src/test/resources/disk_list.json | 17 -
.../src/test/resources/firewall_get.json | 30 -
.../src/test/resources/firewall_insert.json | 1 -
.../src/test/resources/firewall_list.json | 58 -
.../src/test/resources/global_operation.json | 15 -
.../test/resources/global_operation_list.json | 22 -
.../src/test/resources/image_get.json | 13 -
.../src/test/resources/image_insert.json | 4 -
.../src/test/resources/image_list.json | 24 -
.../src/test/resources/image_list_empty.json | 6 -
.../resources/image_list_multiple_page_1.json | 55 -
.../resources/image_list_multiple_page_2.json | 47 -
.../test/resources/image_list_single_page.json | 50 -
.../resources/instance_add_access_config.json | 11 -
.../test/resources/instance_attach_disk.json | 6 -
.../src/test/resources/instance_get.json | 62 -
.../src/test/resources/instance_insert.json | 1 -
.../test/resources/instance_insert_simple.json | 1 -
.../src/test/resources/instance_list.json | 69 -
.../instance_list_central1b_empty.json | 6 -
.../test/resources/instance_serial_port.json | 4 -
.../test/resources/instance_set_metadata.json | 10 -
.../src/test/resources/logback.xml | 83 --
.../src/test/resources/machinetype.json | 22 -
.../src/test/resources/machinetype_list.json | 57 -
.../resources/machinetype_list_central1b.json | 43 -
.../machinetype_list_central1b_empty.json | 6 -
.../src/test/resources/metadata.json | 1 -
.../src/test/resources/network_get.json | 10 -
.../src/test/resources/network_insert.json | 1 -
.../src/test/resources/network_list.json | 18 -
.../src/test/resources/operation.json | 17 -
.../src/test/resources/operation_error.json | 26 -
.../src/test/resources/operation_list.json | 24 -
.../src/test/resources/project.json | 69 -
.../1.8.0-stratos/src/test/resources/quota.json | 5 -
.../src/test/resources/region_get.json | 60 -
.../src/test/resources/region_list.json | 126 --
.../src/test/resources/region_operation.json | 16 -
.../test/resources/region_operation_list.json | 23 -
.../src/test/resources/route_get.json | 14 -
.../src/test/resources/route_insert.json | 1 -
.../src/test/resources/route_list.json | 34 -
.../src/test/resources/snapshot_get.json | 13 -
.../src/test/resources/snapshot_list.json | 33 -
.../src/test/resources/tag_insert.json | 1 -
.../1.8.0-stratos/src/test/resources/testpk.pem | 15 -
.../src/test/resources/tokenResponse.json | 5 -
.../src/test/resources/zone_get.json | 17 -
.../src/test/resources/zone_list.json | 41 -
.../src/test/resources/zone_list_short.json | 24 -
.../src/test/resources/zone_operation.json | 16 -
.../test/resources/zone_operation_error.json | 25 -
.../src/test/resources/zone_operation_list.json | 23 -
.../openstack-nova/1.8.0-stratos/README.txt | 3 -
.../apis/openstack-nova/1.8.0-stratos/pom.xml | 157 ---
.../jclouds/openstack/nova/v2_0/NovaApi.java | 204 ---
.../openstack/nova/v2_0/NovaApiMetadata.java | 111 --
.../v2_0/binders/BindConsoleToJsonPayload.java | 63 -
.../v2_0/binders/BindKeyPairToJsonPayload.java | 43 -
.../v2_0/binders/BindMetadataToJsonPayload.java | 43 -
.../BindSecurityGroupRuleToJsonPayload.java | 66 -
.../nova/v2_0/compute/NovaComputeService.java | 180 ---
.../v2_0/compute/NovaComputeServiceAdapter.java | 287 -----
.../config/NovaComputeServiceContextModule.java | 293 -----
.../compute/extensions/NovaImageExtension.java | 137 --
.../extensions/NovaSecurityGroupExtension.java | 371 ------
.../AllocateAndAddFloatingIpToNode.java | 151 ---
.../functions/CreateSecurityGroupIfNeeded.java | 89 --
.../functions/FlavorInZoneToHardware.java | 58 -
.../compute/functions/ImageInZoneToImage.java | 68 -
.../functions/ImageToOperatingSystem.java | 126 --
.../NovaSecurityGroupInZoneToSecurityGroup.java | 73 --
.../NovaSecurityGroupToSecurityGroup.java | 67 -
.../functions/OrphanedGroupsByZoneId.java | 73 --
.../RemoveFloatingIpFromNodeAndDeallocate.java | 72 --
.../SecurityGroupRuleToIpPermission.java | 97 --
.../functions/ServerInZoneToNodeMetadata.java | 207 ---
.../compute/loaders/CreateUniqueKeyPair.java | 76 --
.../loaders/FindSecurityGroupOrCreate.java | 82 --
.../loaders/LoadFloatingIpsForInstance.java | 61 -
.../options/NodeAndNovaTemplateOptions.java | 54 -
.../compute/options/NovaTemplateOptions.java | 696 ----------
.../predicates/AllNodesInGroupTerminated.java | 53 -
...desWithGroupEncodedIntoNameThenAddToSet.java | 172 ---
.../nova/v2_0/config/NovaHttpApiModule.java | 116 --
.../nova/v2_0/config/NovaParserModule.java | 176 ---
.../nova/v2_0/config/NovaProperties.java | 41 -
.../openstack/nova/v2_0/domain/Address.java | 137 --
.../openstack/nova/v2_0/domain/BackupType.java | 38 -
.../openstack/nova/v2_0/domain/Console.java | 161 ---
.../openstack/nova/v2_0/domain/Flavor.java | 210 ----
.../openstack/nova/v2_0/domain/FloatingIP.java | 188 ---
.../openstack/nova/v2_0/domain/Host.java | 127 --
.../nova/v2_0/domain/HostAggregate.java | 250 ----
.../nova/v2_0/domain/HostResourceUsage.java | 180 ---
.../openstack/nova/v2_0/domain/Image.java | 301 -----
.../openstack/nova/v2_0/domain/Ingress.java | 159 ---
.../openstack/nova/v2_0/domain/KeyPair.java | 189 ---
.../openstack/nova/v2_0/domain/Network.java | 172 ---
.../openstack/nova/v2_0/domain/Quota.java | 356 ------
.../openstack/nova/v2_0/domain/RebootType.java | 31 -
.../nova/v2_0/domain/SecurityGroup.java | 188 ---
.../nova/v2_0/domain/SecurityGroupRule.java | 174 ---
.../openstack/nova/v2_0/domain/Server.java | 482 -------
.../nova/v2_0/domain/ServerCreated.java | 126 --
.../v2_0/domain/ServerExtendedAttributes.java | 155 ---
.../nova/v2_0/domain/ServerExtendedStatus.java | 154 ---
.../v2_0/domain/ServerWithSecurityGroups.java | 127 --
.../nova/v2_0/domain/SimpleServerUsage.java | 311 -----
.../nova/v2_0/domain/SimpleTenantUsage.java | 244 ----
.../nova/v2_0/domain/TenantIdAndName.java | 126 --
.../nova/v2_0/domain/VirtualInterface.java | 127 --
.../openstack/nova/v2_0/domain/Volume.java | 346 -----
.../nova/v2_0/domain/VolumeAttachment.java | 172 ---
.../nova/v2_0/domain/VolumeSnapshot.java | 239 ----
.../openstack/nova/v2_0/domain/VolumeType.java | 192 ---
.../domain/zonescoped/AvailabilityZone.java | 68 -
.../v2_0/domain/zonescoped/FlavorInZone.java | 43 -
.../v2_0/domain/zonescoped/ImageInZone.java | 43 -
.../domain/zonescoped/SecurityGroupInZone.java | 43 -
.../v2_0/domain/zonescoped/ServerInZone.java | 43 -
.../nova/v2_0/domain/zonescoped/ZoneAndId.java | 83 --
.../v2_0/domain/zonescoped/ZoneAndName.java | 109 --
.../ZoneSecurityGroupNameAndPorts.java | 59 -
.../nova/v2_0/domain/zonescoped/ZoneState.java | 56 -
.../v2_0/extensions/AvailabilityZoneApi.java | 54 -
.../nova/v2_0/extensions/ConsolesApi.java | 66 -
.../v2_0/extensions/ExtensionNamespaces.java | 113 --
.../v2_0/extensions/FlavorExtraSpecsApi.java | 130 --
.../nova/v2_0/extensions/FloatingIPApi.java | 154 ---
.../v2_0/extensions/HostAdministrationApi.java | 168 ---
.../nova/v2_0/extensions/HostAggregateApi.java | 157 ---
.../nova/v2_0/extensions/KeyPairApi.java | 126 --
.../nova/v2_0/extensions/QuotaApi.java | 93 --
.../nova/v2_0/extensions/SecurityGroupApi.java | 154 ---
.../nova/v2_0/extensions/ServerAdminApi.java | 199 ---
.../extensions/ServerWithSecurityGroupsApi.java | 68 -
.../v2_0/extensions/SimpleTenantUsageApi.java | 72 --
.../v2_0/extensions/VirtualInterfaceApi.java | 59 -
.../nova/v2_0/extensions/VolumeApi.java | 247 ----
.../v2_0/extensions/VolumeAttachmentApi.java | 132 --
.../nova/v2_0/extensions/VolumeTypeApi.java | 180 ---
.../openstack/nova/v2_0/features/FlavorApi.java | 136 --
.../openstack/nova/v2_0/features/ImageApi.java | 231 ----
.../openstack/nova/v2_0/features/ServerApi.java | 433 -------
.../functions/FieldValueResponseParsers.java | 105 --
.../nova/v2_0/functions/OverLimitParser.java | 89 --
.../ParseImageIdFromLocationHeader.java | 37 -
.../internal/OnlyMetadataValueOrNull.java | 59 -
.../functions/internal/ParseDiagnostics.java | 44 -
.../functions/internal/ParseFlavorDetails.java | 92 --
.../v2_0/functions/internal/ParseFlavors.java | 94 --
.../functions/internal/ParseImageDetails.java | 93 --
.../v2_0/functions/internal/ParseImages.java | 94 --
.../v2_0/functions/internal/ParseKeyPairs.java | 60 -
.../functions/internal/ParseServerDetails.java | 92 --
.../v2_0/functions/internal/ParseServers.java | 94 --
.../nova/v2_0/handlers/NovaErrorHandler.java | 126 --
.../options/CreateBackupOfServerOptions.java | 102 --
.../nova/v2_0/options/CreateServerOptions.java | 553 --------
.../nova/v2_0/options/CreateVolumeOptions.java | 217 ----
.../options/CreateVolumeSnapshotOptions.java | 135 --
.../v2_0/options/CreateVolumeTypeOptions.java | 98 --
.../nova/v2_0/options/ListOptions.java | 106 --
.../nova/v2_0/options/RebuildServerOptions.java | 138 --
.../FindSecurityGroupWithNameAndReturnTrue.java | 82 --
.../nova/v2_0/predicates/ImagePredicates.java | 53 -
.../nova/v2_0/predicates/KeyPairPredicates.java | 75 --
.../predicates/SecurityGroupPredicates.java | 211 ----
.../nova/v2_0/predicates/ServerPredicates.java | 117 --
.../services/org.jclouds.apis.ApiMetadata | 1 -
...tKeyAndTenantIdAuthenticationExpectTest.java | 74 --
...antNamePropertyAuthenticationExpectTest.java | 74 --
...KeyAndSecretKeyAuthenticationExpectTest.java | 68 -
.../nova/v2_0/EndpointIdIsRandomExpectTest.java | 70 --
.../nova/v2_0/NovaApiMetadataTest.java | 28 -
.../v2_0/PasswordAuthenticationExpectTest.java | 59 -
...dAuthenticationWithTenantNameExpectTest.java | 68 -
.../NovaComputeServiceAdapterExpectTest.java | 424 -------
.../compute/NovaComputeServiceExpectTest.java | 381 ------
.../compute/NovaComputeServiceLiveTest.java | 92 --
.../NovaImageExtensionExpectTest.java | 88 --
.../extensions/NovaImageExtensionLiveTest.java | 40 -
.../NovaSecurityGroupExtensionExpectTest.java | 429 -------
.../NovaSecurityGroupExtensionLiveTest.java | 32 -
...llocateAndAddFloatingIpToNodeExpectTest.java | 179 ---
.../functions/FlavorInZoneToHardwareTest.java | 88 --
.../functions/ImageInZoneToImageTest.java | 93 --
.../functions/ImageToOperatingSystemTest.java | 190 ---
...aSecurityGroupInZoneToSecurityGroupTest.java | 91 --
.../NovaSecurityGroupToSecurityGroupTest.java | 152 ---
.../functions/OrphanedGroupsByZoneIdTest.java | 91 --
.../SecurityGroupRuleToIpPermissionTest.java | 79 --
.../ServerInZoneToNodeMetadataTest.java | 341 -----
.../loaders/CreateUniqueKeyPairTest.java | 108 --
.../loaders/FindSecurityGroupOrCreateTest.java | 141 ---
.../loaders/LoadFloatingIpsForInstanceTest.java | 105 --
.../options/NovaTemplateOptionsTest.java | 261 ----
.../extensions/AdminActionsApiExpectTest.java | 349 -----
.../extensions/AdminActionsApiLiveTest.java | 193 ---
.../AvailabilityZoneApiExpectTest.java | 59 -
.../AvailabilityZonesApiLiveTest.java | 43 -
.../v2_0/extensions/ConsolesApiLiveTest.java | 64 -
.../v2_0/extensions/ConsolesApiMockTest.java | 144 ---
.../FlavorExtraSpecsApiExpectTest.java | 140 ---
.../extensions/FlavorExtraSpecsApiLiveTest.java | 121 --
.../extensions/FloatingIPApiExpectTest.java | 189 ---
.../v2_0/extensions/FloatingIPApiLiveTest.java | 169 ---
.../HostAdministrationApiExpectTest.java | 239 ----
.../HostAdministrationApiLiveTest.java | 114 --
.../extensions/HostAggregateApiExpectTest.java | 177 ---
.../extensions/HostAggregateApiLiveTest.java | 146 ---
.../v2_0/extensions/KeyPairApiExpectTest.java | 175 ---
.../v2_0/extensions/KeyPairApiLiveTest.java | 84 --
.../v2_0/extensions/QuotaApiExpectTest.java | 125 --
.../nova/v2_0/extensions/QuotaApiLiveTest.java | 98 --
.../extensions/SecurityGroupApiExpectTest.java | 233 ----
.../extensions/SecurityGroupApiLiveTest.java | 98 --
.../ServerWithSecurityGroupsApiExpectTest.java | 61 -
.../ServerWithSecurityGroupsApiLiveTest.java | 78 --
.../SimpleTenantUsageApiExpectTest.java | 97 --
.../SimpleTenantUsageApiLiveTest.java | 49 -
.../VirtualInterfaceApiExpectTest.java | 62 -
.../extensions/VirtualInterfaceApiLiveTest.java | 66 -
.../v2_0/extensions/VolumeApiExpectTest.java | 458 -------
.../nova/v2_0/extensions/VolumeApiLiveTest.java | 282 -----
.../VolumeAttachmentApiExpectTest.java | 166 ---
.../extensions/VolumeAttachmentApiLiveTest.java | 154 ---
.../extensions/VolumeTypeApiExpectTest.java | 257 ----
.../v2_0/extensions/VolumeTypeApiLiveTest.java | 124 --
.../v2_0/features/ExtensionApiExpectTest.java | 110 --
.../v2_0/features/ExtensionApiLiveTest.java | 82 --
.../nova/v2_0/features/FlavorApiExpectTest.java | 156 ---
.../nova/v2_0/features/FlavorApiLiveTest.java | 103 --
.../nova/v2_0/features/ImageApiExpectTest.java | 366 ------
.../nova/v2_0/features/ImageApiLiveTest.java | 99 --
.../nova/v2_0/features/ServerApiExpectTest.java | 735 -----------
.../nova/v2_0/features/ServerApiLiveTest.java | 218 ----
.../CreateSecurityGroupIfNeededTest.java | 164 ---
...ityGroupWithNameAndReturnTrueExpectTest.java | 98 --
.../v2_0/functions/InternalURLLiveTest.java | 63 -
.../v2_0/handlers/NovaErrorHandlerTest.java | 221 ----
.../v2_0/internal/BaseNovaApiExpectTest.java | 26 -
.../nova/v2_0/internal/BaseNovaApiLiveTest.java | 134 --
...BaseNovaComputeServiceContextExpectTest.java | 87 --
.../BaseNovaComputeServiceExpectTest.java | 33 -
.../nova/v2_0/internal/BaseNovaExpectTest.java | 82 --
...eComputeServiceTypicalSecurityGroupTest.java | 72 --
.../nova/v2_0/parse/ParseCreateFlavorTest.java | 55 -
.../nova/v2_0/parse/ParseCreatedServerTest.java | 77 --
.../parse/ParseExtensionListNormalTest.java | 72 --
.../nova/v2_0/parse/ParseExtensionListTest.java | 84 --
.../nova/v2_0/parse/ParseExtensionTest.java | 68 -
.../nova/v2_0/parse/ParseFlavorListTest.java | 81 --
.../nova/v2_0/parse/ParseFlavorTest.java | 67 -
.../v2_0/parse/ParseFloatingIPListTest.java | 61 -
.../nova/v2_0/parse/ParseFloatingIPTest.java | 53 -
.../nova/v2_0/parse/ParseImageListTest.java | 81 --
.../nova/v2_0/parse/ParseImageTest.java | 95 --
.../nova/v2_0/parse/ParseKeyPairListTest.java | 64 -
.../nova/v2_0/parse/ParseKeyPairTest.java | 60 -
.../nova/v2_0/parse/ParseMetadataItemTest.java | 54 -
.../nova/v2_0/parse/ParseMetadataListTest.java | 59 -
.../v2_0/parse/ParseMetadataUpdateTest.java | 60 -
.../nova/v2_0/parse/ParseNOVNCConsoleTest.java | 69 -
.../nova/v2_0/parse/ParseRDPConsoleTest.java | 70 --
.../nova/v2_0/parse/ParseSPICEConsoleTest.java | 70 --
.../v2_0/parse/ParseSecurityGroupListTest.java | 68 -
.../nova/v2_0/parse/ParseSecurityGroupTest.java | 65 -
.../v2_0/parse/ParseServerDetailsEssexTest.java | 167 ---
.../parse/ParseServerDetailsStatesTest.java | 252 ----
.../nova/v2_0/parse/ParseServerDiagnostics.java | 53 -
.../nova/v2_0/parse/ParseServerListTest.java | 81 --
.../nova/v2_0/parse/ParseServerTest.java | 114 --
.../parse/ParseServerWithAllExtensionsTest.java | 101 --
.../ParseServerWithInternetAddressesTest.java | 96 --
.../v2_0/parse/ParseServerWithoutImageTest.java | 99 --
.../nova/v2_0/parse/ParseXVPVNCConsoleTest.java | 68 -
...ublicIpsInPrivateAddressBlockExpectTest.java | 96 --
.../v2_0/predicates/ImagePredicatesTest.java | 40 -
.../predicates/SecurityGroupPredicatesTest.java | 125 --
.../predicates/ServerPredicatesMockTest.java | 105 --
.../src/test/resources/access.json | 228 ----
.../src/test/resources/attachment_details.json | 8 -
.../src/test/resources/attachment_list.json | 10 -
.../src/test/resources/extension_details.json | 21 -
.../src/test/resources/extension_list.json | 42 -
.../src/test/resources/extension_list_full.json | 284 -----
.../test/resources/extension_list_normal.json | 36 -
.../resources/extension_list_openstack.json | 140 ---
.../src/test/resources/flavor_details.json | 19 -
.../src/test/resources/flavor_list.json | 32 -
.../src/test/resources/flavor_list_detail.json | 124 --
.../resources/flavor_list_detail_openstack.json | 104 --
.../src/test/resources/flavor_new.json | 10 -
.../src/test/resources/floatingip_details.json | 9 -
.../src/test/resources/floatingip_list.json | 30 -
.../1.8.0-stratos/src/test/resources/host.json | 40 -
.../test/resources/host_aggregate_details.json | 17 -
.../src/test/resources/host_aggregate_list.json | 19 -
.../host_aggregate_with_host_details.json | 19 -
.../src/test/resources/hosts_list.json | 8 -
.../src/test/resources/image_active.json | 41 -
.../src/test/resources/image_details.json | 41 -
.../src/test/resources/image_list.json | 32 -
.../src/test/resources/image_list_detail.json | 503 --------
.../image_list_detail_imageextension.json | 146 ---
.../resources/image_list_detail_openstack.json | 98 --
.../keypair_created_computeservice.json | 9 -
.../src/test/resources/keypair_details.json | 9 -
.../src/test/resources/keypair_list.json | 18 -
.../test/resources/listAvailabilityZones.json | 11 -
.../src/test/resources/metadata_item.json | 5 -
.../src/test/resources/metadata_list.json | 6 -
.../src/test/resources/metadata_updated.json | 7 -
.../src/test/resources/new_server.json | 48 -
.../test/resources/new_server_config_drive.json | 42 -
.../resources/new_server_disk_config_auto.json | 49 -
.../new_server_disk_config_manual.json | 49 -
.../src/test/resources/new_server_in_zone.json | 48 -
.../resources/new_server_networks_response.json | 42 -
.../test/resources/new_server_no_adminpass.json | 40 -
.../resources/new_server_nova_networks.json | 41 -
.../src/test/resources/novnc_console.json | 7 -
.../src/test/resources/quotas.json | 17 -
.../src/test/resources/rdp_console.json | 7 -
.../test/resources/securitygroup_created.json | 9 -
.../test/resources/securitygroup_details.json | 33 -
...itygroup_details_computeservice_typical.json | 56 -
.../securitygroup_details_extension.json | 33 -
...securitygroup_details_extension_norules.json | 9 -
.../resources/securitygroup_details_port22.json | 21 -
.../src/test/resources/securitygroup_list.json | 45 -
...oup_list_details_computeservice_typical.json | 58 -
.../resources/securitygroup_list_extension.json | 45 -
.../resources/securitygrouprule_created.json | 13 -
.../securitygrouprule_created_cidr.json | 13 -
.../securitygrouprule_created_group.json | 14 -
.../src/test/resources/server_details.json | 86 --
.../test/resources/server_details_devstack.json | 60 -
.../resources/server_details_openstack.json | 55 -
.../resources/server_details_without_image.json | 74 --
.../src/test/resources/server_diagnostics.json | 17 -
.../src/test/resources/server_list.json | 32 -
.../src/test/resources/server_list_details.json | 78 --
.../resources/server_list_details_essex.json | 188 ---
.../resources/server_list_details_states.json | 342 -----
.../resources/server_public_ip_in_private.json | 61 -
.../resources/server_with_security_groups.json | 62 -
.../server_with_security_groups_extension.json | 59 -
.../src/test/resources/simple_tenant_usage.json | 39 -
.../test/resources/simple_tenant_usages.json | 13 -
.../src/test/resources/snapshot_details.json | 11 -
.../src/test/resources/snapshot_list.json | 13 -
.../test/resources/snapshot_list_detail.json | 13 -
.../src/test/resources/spice_console.json | 7 -
.../test/resources/virtual_interfaces_list.json | 8 -
.../src/test/resources/volume_details.json | 22 -
.../src/test/resources/volume_list.json | 24 -
.../src/test/resources/volume_list_detail.json | 24 -
.../src/test/resources/volume_type.json | 14 -
.../test/resources/volume_type_extra_specs.json | 5 -
.../src/test/resources/volume_type_list.json | 16 -
.../src/test/resources/xvpvnc_console.json | 7 -
.../apis/vcloud/1.8.0-stratos/README.txt | 6 -
.../jclouds/apis/vcloud/1.8.0-stratos/pom.xml | 131 --
.../vcloud/TaskInErrorStateException.java | 34 -
.../vcloud/TaskStillRunningException.java | 34 -
.../main/java/org/jclouds/vcloud/VCloudApi.java | 90 --
.../org/jclouds/vcloud/VCloudApiMetadata.java | 101 --
.../org/jclouds/vcloud/VCloudMediaType.java | 221 ----
.../jclouds/vcloud/VCloudResponseException.java | 66 -
.../java/org/jclouds/vcloud/VCloudToken.java | 34 -
.../org/jclouds/vcloud/VCloudVersionsApi.java | 38 -
.../binders/BindCPUCountToXmlPayload.java | 74 --
.../BindCaptureVAppParamsToXmlPayload.java | 119 --
.../binders/BindCatalogItemToXmlPayload.java | 121 --
.../binders/BindCloneParamsToXmlPayload.java | 128 --
.../BindCloneVAppParamsToXmlPayload.java | 60 -
...BindCloneVAppTemplateParamsToXmlPayload.java | 55 -
.../BindDeployVAppParamsToXmlPayload.java | 37 -
...ndGuestCustomizationSectionToXmlPayload.java | 107 --
...stantiateVAppTemplateParamsToXmlPayload.java | 216 ----
.../vcloud/binders/BindMemoryToXmlPayload.java | 75 --
...indNetworkConnectionSectionToXmlPayload.java | 101 --
.../vcloud/binders/BindParamsToXmlPayload.java | 76 --
.../BindUndeployVAppParamsToXmlPayload.java | 37 -
.../OrgNameAndCatalogNameToEndpoint.java | 75 --
.../binders/OrgNameAndVDCNameToEndpoint.java | 74 --
.../OrgNameCatalogNameItemNameToEndpoint.java | 73 --
...meCatalogNameVAppTemplateNameToEndpoint.java | 86 --
.../OrgNameVDCNameNetworkNameToEndpoint.java | 50 -
...NameVDCNameResourceEntityNameToEndpoint.java | 50 -
.../OrgNameVDCNameResourceNameToEndpoint.java | 77 --
.../VCloudComputeServiceContextModule.java | 37 -
.../VCloudComputeServiceDependenciesModule.java | 150 ---
.../functions/FindLocationForResource.java | 66 -
.../compute/functions/HardwareForVApp.java | 68 -
.../functions/HardwareForVAppTemplate.java | 81 --
.../compute/functions/ImageForVAppTemplate.java | 79 --
.../compute/functions/VAppToNodeMetadata.java | 111 --
...dHardwareBuilderFromResourceAllocations.java | 40 -
...EnvelopeOrThrowIllegalArgumentException.java | 74 --
.../internal/VCloudTemplateBuilderImpl.java | 45 -
.../compute/options/VCloudTemplateOptions.java | 348 -----
...edIntoNameThenCustomizeDeployAndPowerOn.java | 299 -----
...etworkConfigurationForNetworkAndOptions.java | 76 --
.../strategy/VCloudComputeServiceAdapter.java | 262 ----
.../vcloud/compute/util/VCloudComputeUtils.java | 112 --
.../vcloud/config/DefaultCatalogForOrg.java | 59 -
.../vcloud/config/DefaultNetworkForVDC.java | 61 -
.../vcloud/config/DefaultOrgForUser.java | 54 -
.../vcloud/config/DefaultTasksListForOrg.java | 49 -
.../config/DefaultVCloudReferencesModule.java | 161 ---
.../jclouds/vcloud/config/DefaultVDCForOrg.java | 59 -
.../vcloud/config/VCloudHttpApiModule.java | 536 --------
.../jclouds/vcloud/domain/AllocationModel.java | 70 --
.../org/jclouds/vcloud/domain/Capacity.java | 106 --
.../java/org/jclouds/vcloud/domain/Catalog.java | 66 -
.../org/jclouds/vcloud/domain/CatalogItem.java | 34 -
.../domain/GuestCustomizationSection.java | 440 -------
.../domain/InstantiateVAppTemplateParams.java | 96 --
.../vcloud/domain/NetworkConnection.java | 231 ----
.../vcloud/domain/NetworkConnectionSection.java | 218 ----
.../java/org/jclouds/vcloud/domain/Org.java | 84 --
.../jclouds/vcloud/domain/ReferenceType.java | 52 -
.../java/org/jclouds/vcloud/domain/Status.java | 244 ----
.../java/org/jclouds/vcloud/domain/Task.java | 72 --
.../org/jclouds/vcloud/domain/TaskStatus.java | 68 -
.../org/jclouds/vcloud/domain/TasksList.java | 34 -
.../java/org/jclouds/vcloud/domain/VApp.java | 85 --
.../org/jclouds/vcloud/domain/VAppTemplate.java | 95 --
.../org/jclouds/vcloud/domain/VCloudError.java | 118 --
.../jclouds/vcloud/domain/VCloudSession.java | 25 -
.../java/org/jclouds/vcloud/domain/VDC.java | 144 ---
.../org/jclouds/vcloud/domain/VDCStatus.java | 57 -
.../main/java/org/jclouds/vcloud/domain/Vm.java | 106 --
.../vcloud/domain/internal/CatalogImpl.java | 189 ---
.../vcloud/domain/internal/CatalogItemImpl.java | 106 --
.../vcloud/domain/internal/ErrorImpl.java | 114 --
.../jclouds/vcloud/domain/internal/OrgImpl.java | 168 ---
.../domain/internal/ReferenceTypeImpl.java | 99 --
.../vcloud/domain/internal/TaskImpl.java | 160 ---
.../vcloud/domain/internal/TasksListImpl.java | 78 --
.../vcloud/domain/internal/VAppImpl.java | 163 ---
.../domain/internal/VAppTemplateImpl.java | 202 ---
.../jclouds/vcloud/domain/internal/VDCImpl.java | 289 -----
.../jclouds/vcloud/domain/internal/VmImpl.java | 214 ----
.../vcloud/domain/network/DhcpService.java | 106 --
.../jclouds/vcloud/domain/network/Features.java | 95 --
.../vcloud/domain/network/FenceMode.java | 68 -
.../vcloud/domain/network/FirewallService.java | 86 --
.../domain/network/IpAddressAllocationMode.java | 50 -
.../jclouds/vcloud/domain/network/IpRange.java | 75 --
.../jclouds/vcloud/domain/network/IpScope.java | 169 ---
.../vcloud/domain/network/NatService.java | 115 --
.../vcloud/domain/network/NetworkConfig.java | 163 ---
.../vcloud/domain/network/OrgNetwork.java | 119 --
.../domain/network/firewall/FirewallPolicy.java | 53 -
.../network/firewall/FirewallProtocols.java | 71 --
.../domain/network/firewall/FirewallRule.java | 124 --
.../domain/network/internal/OrgNetworkImpl.java | 198 ---
.../vcloud/domain/network/nat/NatPolicy.java | 53 -
.../vcloud/domain/network/nat/NatProtocol.java | 46 -
.../vcloud/domain/network/nat/NatRule.java | 33 -
.../vcloud/domain/network/nat/NatType.java | 59 -
.../domain/network/nat/rules/MappingMode.java | 53 -
.../network/nat/rules/OneToOneVmRule.java | 109 --
.../network/nat/rules/PortForwardingRule.java | 110 --
.../vcloud/domain/network/nat/rules/VmRule.java | 127 --
.../EditableResourceAllocationSettingData.java | 298 -----
.../vcloud/domain/ovf/VCloudHardDisk.java | 326 -----
.../vcloud/domain/ovf/VCloudNetworkAdapter.java | 328 -----
.../vcloud/domain/ovf/VCloudNetworkSection.java | 80 --
.../ovf/VCloudOperatingSystemSection.java | 118 --
.../ovf/VCloudVirtualHardwareSection.java | 179 ---
.../org/jclouds/vcloud/endpoints/Catalog.java | 34 -
.../org/jclouds/vcloud/endpoints/Network.java | 34 -
.../java/org/jclouds/vcloud/endpoints/Org.java | 34 -
.../org/jclouds/vcloud/endpoints/OrgList.java | 34 -
.../org/jclouds/vcloud/endpoints/TasksList.java | 34 -
.../jclouds/vcloud/endpoints/VCloudLogin.java | 36 -
.../java/org/jclouds/vcloud/endpoints/VDC.java | 34 -
.../org/jclouds/vcloud/features/CatalogApi.java | 143 ---
.../org/jclouds/vcloud/features/NetworkApi.java | 60 -
.../org/jclouds/vcloud/features/OrgApi.java | 84 --
.../org/jclouds/vcloud/features/TaskApi.java | 80 --
.../org/jclouds/vcloud/features/VAppApi.java | 260 ----
.../vcloud/features/VAppTemplateApi.java | 179 ---
.../org/jclouds/vcloud/features/VDCApi.java | 71 --
.../java/org/jclouds/vcloud/features/VmApi.java | 293 -----
...ddVCloudAuthorizationAndCookieToRequest.java | 60 -
.../vcloud/functions/CatalogItemsInCatalog.java | 61 -
.../vcloud/functions/CatalogItemsInOrg.java | 54 -
.../jclouds/vcloud/functions/CatalogsInOrg.java | 69 -
.../functions/DefaultNetworkNameInTemplate.java | 47 -
.../jclouds/vcloud/functions/NetworksInOrg.java | 54 -
.../vcloud/functions/OrgNameToEndpoint.java | 53 -
.../functions/OrgNameToTasksListEndpoint.java | 58 -
.../vcloud/functions/OrgsForLocations.java | 70 --
.../jclouds/vcloud/functions/OrgsForNames.java | 53 -
.../ParseLoginResponseFromHeaders.java | 103 --
.../functions/VAppTemplatesForCatalogItems.java | 63 -
.../vcloud/functions/VAppTemplatesInOrg.java | 62 -
.../org/jclouds/vcloud/functions/VDCsInOrg.java | 54 -
.../ParseVCloudErrorFromHttpResponse.java | 118 --
.../http/filters/VCloudBasicAuthentication.java | 58 -
.../http/filters/VCloudSupportedVersions.java | 35 -
.../jclouds/vcloud/internal/VCloudLoginApi.java | 45 -
.../org/jclouds/vcloud/loaders/OVFLoader.java | 47 -
.../vcloud/loaders/VAppTemplateLoader.java | 47 -
.../org/jclouds/vcloud/location/DefaultVDC.java | 74 --
.../location/OrgAndVDCToLocationSupplier.java | 90 --
.../vcloud/options/CaptureVAppOptions.java | 46 -
.../vcloud/options/CatalogItemOptions.java | 72 --
.../jclouds/vcloud/options/CloneOptions.java | 48 -
.../vcloud/options/CloneVAppOptions.java | 83 --
.../options/CloneVAppTemplateOptions.java | 37 -
.../options/InstantiateVAppTemplateOptions.java | 173 ---
.../jclouds/vcloud/predicates/TaskSuccess.java | 63 -
.../vcloud/reference/VCloudConstants.java | 52 -
.../jclouds/vcloud/reference/package-info.java | 20 -
...thNameMatchingConfigurationKeyOrDefault.java | 95 --
.../vcloud/suppliers/VAppTemplatesSupplier.java | 83 --
.../java/org/jclouds/vcloud/util/Utils.java | 67 -
.../org/jclouds/vcloud/util/VCloudUtils.java | 65 -
.../org/jclouds/vcloud/xml/CatalogHandler.java | 101 --
.../jclouds/vcloud/xml/CatalogItemHandler.java | 78 --
.../org/jclouds/vcloud/xml/ErrorHandler.java | 42 -
.../xml/GuestCustomizationSectionHandler.java | 134 --
.../vcloud/xml/NetworkConnectionHandler.java | 84 --
.../xml/NetworkConnectionSectionHandler.java | 100 --
.../java/org/jclouds/vcloud/xml/OrgHandler.java | 109 --
.../org/jclouds/vcloud/xml/OrgListHandler.java | 51 -
.../jclouds/vcloud/xml/OrgNetworkHandler.java | 322 -----
.../vcloud/xml/SupportedVersionsHandler.java | 57 -
.../org/jclouds/vcloud/xml/TaskHandler.java | 125 --
.../jclouds/vcloud/xml/TasksListHandler.java | 71 --
.../org/jclouds/vcloud/xml/VAppHandler.java | 148 ---
.../jclouds/vcloud/xml/VAppTemplateHandler.java | 149 ---
.../xml/VCloudVirtualHardwareHandler.java | 69 -
.../java/org/jclouds/vcloud/xml/VDCHandler.java | 164 ---
.../java/org/jclouds/vcloud/xml/VmHandler.java | 175 ---
.../xml/ovf/VCloudNetworkSectionHandler.java | 66 -
.../xml/ovf/VCloudOperatingSystemHandler.java | 78 --
...oudResourceAllocationSettingDataHandler.java | 86 --
.../services/org.jclouds.apis.ApiMetadata | 1 -
.../jclouds/vcloud/VCloudApiMetadataTest.java | 28 -
.../java/org/jclouds/vcloud/VCloudApiTest.java | 62 -
.../vcloud/VCloudSessionRefreshLiveTest.java | 39 -
.../jclouds/vcloud/VCloudVersionsApiTest.java | 67 -
.../BindCatalogItemToXmlPayloadTest.java | 51 -
.../BindCloneVAppParamsToXmlPayloadTest.java | 79 --
...CloneVAppTemplateParamsToXmlPayloadTest.java | 87 --
.../BindDeployVAppParamsToXmlPayloadTest.java | 59 -
...tiateVAppTemplateParamsToXmlPayloadTest.java | 177 ---
...etworkConnectionSectionToXmlPayloadTest.java | 66 -
.../BindUndeployVAppParamsToXmlPayloadTest.java | 59 -
.../BaseVCloudComputeServiceExpectTest.java | 158 ---
.../compute/VCloudComputeServiceLiveTest.java | 49 -
.../functions/FindLocationForResourceTest.java | 62 -
.../functions/ListImagesInVCloudExpectTest.java | 85 --
.../functions/VAppToNodeMetadataTest.java | 226 ----
.../options/VCloudTemplateOptionsTest.java | 195 ---
...ThenCustomizeDeployAndPowerOnExpectTest.java | 167 ---
.../VCloudComputeServiceAdapterTest.java | 89 --
.../vcloud/features/CatalogApiLiveTest.java | 50 -
.../jclouds/vcloud/features/CatalogApiTest.java | 129 --
.../vcloud/features/NetworkApiLiveTest.java | 26 -
.../jclouds/vcloud/features/NetworkApiTest.java | 73 --
.../jclouds/vcloud/features/OrgApiLiveTest.java | 39 -
.../org/jclouds/vcloud/features/OrgApiTest.java | 89 --
.../vcloud/features/TaskApiLiveTest.java | 26 -
.../jclouds/vcloud/features/TaskApiTest.java | 106 --
.../vcloud/features/VAppApiLiveTest.java | 49 -
.../jclouds/vcloud/features/VAppApiTest.java | 313 -----
.../features/VAppTemplateApiLiveTest.java | 164 ---
.../vcloud/features/VAppTemplateApiTest.java | 236 ----
.../jclouds/vcloud/features/VDCApiLiveTest.java | 26 -
.../org/jclouds/vcloud/features/VDCApiTest.java | 100 --
.../jclouds/vcloud/features/VmApiLiveTest.java | 161 ---
.../org/jclouds/vcloud/features/VmApiTest.java | 318 -----
...loudAuthorizationAndCookieToRequestTest.java | 51 -
.../ParseLoginResponseFromHeadersTest.java | 145 ---
.../ParseVCloudErrorFromHttpResponseTest.java | 92 --
.../vcloud/internal/BasePayloadTest.java | 51 -
.../vcloud/internal/BaseVCloudApiLiveTest.java | 55 -
.../vcloud/internal/BaseVCloudApiTest.java | 270 ----
.../vcloud/internal/VCloudLoginApiTest.java | 95 --
.../InstantiateVAppTemplateOptionsTest.java | 72 --
...meMatchingConfigurationKeyOrDefaultTest.java | 113 --
.../org/jclouds/vcloud/utils/TestUtils.java | 30 -
.../jclouds/vcloud/xml/CatalogHandlerTest.java | 133 --
.../vcloud/xml/CatalogItemHandlerTest.java | 84 --
.../GuestCustomizationSectionHandlerTest.java | 73 --
.../xml/NetworkConnectionHandlerTest.java | 55 -
.../NetworkConnectionSectionHandlerTest.java | 61 -
.../org/jclouds/vcloud/xml/OrgHandlerTest.java | 122 --
.../jclouds/vcloud/xml/OrgListHandlerTest.java | 55 -
.../vcloud/xml/OrgNetworkHandlerTest.java | 102 --
.../xml/SupportedVersionsHandlerTest.java | 51 -
.../org/jclouds/vcloud/xml/TaskHandlerTest.java | 133 --
.../vcloud/xml/TasksListHandlerTest.java | 80 --
.../org/jclouds/vcloud/xml/VAppHandlerTest.java | 75 --
.../vcloud/xml/VAppTemplateHandlerTest.java | 162 ---
.../org/jclouds/vcloud/xml/VDCHandlerTest.java | 134 --
.../org/jclouds/vcloud/xml/VmHandlerTest.java | 77 --
...VCloudOperatingSystemSectionHandlerTest.java | 59 -
...VCloudVirtualHardwareSectionHandlerTest.java | 151 ---
.../src/test/resources/captureVApp-default.xml | 1 -
.../src/test/resources/captureVApp.xml | 1 -
.../src/test/resources/catalog-blank.xml | 7 -
.../src/test/resources/catalog-hosting.xml | 25 -
.../src/test/resources/catalog.xml | 27 -
.../src/test/resources/catalog1.0-vcd15.xml | 9 -
...alogItem-carrenza-with-default-namespace.xml | 8 -
...talogItem-carrenza-with-vcloud-namespace.xml | 8 -
.../src/test/resources/catalogItem-hosting.xml | 14 -
.../test/resources/catalogItem-terremark.xml | 16 -
.../src/test/resources/catalogItem1.0-vcd15.xml | 8 -
.../src/test/resources/copyVApp-default.xml | 1 -
.../src/test/resources/copyVApp.xml | 1 -
.../test/resources/copyVAppTemplate-default.xml | 1 -
.../src/test/resources/copyVAppTemplate.xml | 1 -
.../src/test/resources/cpuItem.xml | 1 -
.../src/test/resources/guestCustomization.xml | 23 -
.../resources/guestCustomizationSection.xml | 3 -
.../src/test/resources/instantiatedvapp.xml | 13 -
.../instantiationparams-description.xml | 1 -
.../resources/instantiationparams-network.xml | 1 -
.../src/test/resources/instantiationparams.xml | 1 -
.../1.8.0-stratos/src/test/resources/log4j.xml | 151 ---
.../src/test/resources/memoryItem.xml | 1 -
.../src/test/resources/moveVApp.xml | 1 -
.../src/test/resources/moveVAppTemplate.xml | 1 -
.../src/test/resources/networkconnection.xml | 7 -
.../test/resources/networkconnectionsection.xml | 18 -
.../src/test/resources/org-1.0.xml | 24 -
.../src/test/resources/org-hosting.xml | 12 -
.../src/test/resources/org-savvis.xml | 13 -
.../1.8.0-stratos/src/test/resources/org.xml | 5 -
.../src/test/resources/org1.0-vcd15.xml | 11 -
.../src/test/resources/orgList1.0-vcd15.xml | 4 -
.../src/test/resources/orglist-savvis.xml | 3 -
.../src/test/resources/orglist.xml | 3 -
.../src/test/resources/orgnetwork-bridged.xml | 20 -
.../src/test/resources/orgnetwork-isolated.xml | 31 -
.../1.8.0-stratos/src/test/resources/os.xml | 11 -
.../src/test/resources/ovf-multi-vm.xml | 285 -----
.../src/test/resources/ovf-ubuntu64.xml | 148 ---
.../src/test/resources/task-1.0.xml | 9 -
.../src/test/resources/task-error.xml | 9 -
.../src/test/resources/task-hosting.xml | 12 -
.../src/test/resources/task-self.xml | 11 -
.../src/test/resources/task-vcd15.xml | 5 -
.../1.8.0-stratos/src/test/resources/task.xml | 8 -
.../src/test/resources/taskslist-hosting.xml | 14 -
.../src/test/resources/taskslist.xml | 27 -
.../resources/template1.0-vcd15-multi-vm.xml | 68 -
.../src/test/resources/template1.0-vcd15.xml | 72 --
.../src/test/resources/vAppTemplate-copying.xml | 41 -
.../src/test/resources/vAppTemplate.xml | 143 ---
.../vAppTemplate1.0-vcd15_withNewlines.xml | 109 --
.../src/test/resources/vapp-hosting.xml | 235 ----
.../src/test/resources/vapp-none.xml | 237 ----
.../src/test/resources/vapp-pool.xml | 227 ----
.../src/test/resources/vapp-rhel-off-static.xml | 325 -----
.../src/test/resources/vapp-ubuntu-off-dhcp.xml | 213 ----
.../src/test/resources/vapp-unresolved.xml | 21 -
.../src/test/resources/vapp-win-off-static.xml | 219 ----
.../src/test/resources/vdc-1.0.xml | 49 -
.../src/test/resources/vdc-hosting.xml | 60 -
.../src/test/resources/vdc-nonet.xml | 22 -
.../1.8.0-stratos/src/test/resources/vdc.xml | 36 -
.../src/test/resources/vdc1.0-vcd15.xml | 47 -
.../src/test/resources/versions-vcd15.xml | 906 -------------
.../src/test/resources/versions.xml | 7 -
.../test/resources/virtualhardwaresection.xml | 118 --
.../src/test/resources/vm-rhel-off-static.xml | 197 ---
.../provider/aws-ec2/1.8.0-stratos/README.txt | 8 -
.../provider/aws-ec2/1.8.0-stratos/pom.xml | 156 ---
.../src/main/clojure/org/jclouds/aws/ec2.clj | 62 -
.../java/org/jclouds/aws/ec2/AWSEC2Api.java | 117 --
.../org/jclouds/aws/ec2/AWSEC2ApiMetadata.java | 83 --
.../jclouds/aws/ec2/AWSEC2ProviderMetadata.java | 101 --
.../BindLaunchSpecificationToFormParams.java | 97 --
...otInstanceRequestIdsToIndexedFormParams.java | 35 -
.../BindTagFiltersToIndexedFormParams.java | 34 -
.../binders/BindTagsToIndexedFormParams.java | 34 -
.../aws/ec2/compute/AWSEC2ComputeService.java | 157 ---
.../compute/AWSEC2ComputeServiceContext.java | 28 -
.../ec2/compute/AWSEC2TemplateBuilderImpl.java | 50 -
.../aws/ec2/compute/AWSEC2TemplateOptions.java | 819 ------------
.../AWSEC2BindComputeSuppliersByClass.java | 31 -
.../AWSEC2ComputeServiceContextModule.java | 178 ---
.../AWSEC2ComputeServiceDependenciesModule.java | 175 ---
.../aws/ec2/compute/config/ClusterCompute.java | 34 -
.../aws/ec2/compute/config/ImageQuery.java | 34 -
.../AWSEC2SecurityGroupExtension.java | 216 ----
.../AWSEC2SecurityGroupToSecurityGroup.java | 48 -
.../AWSRunningInstanceToNodeMetadata.java | 78 --
.../PresentSpotRequestsAndInstances.java | 93 --
.../AWSEC2ComputeServiceContextImpl.java | 45 -
.../AWSEC2CreateSecurityGroupIfNeeded.java | 135 --
.../AWSEC2CreateNodesInGroupThenAddToSet.java | 113 --
.../strategy/AWSEC2DestroyNodeStrategy.java | 71 --
.../strategy/AWSEC2GetNodeMetadataStrategy.java | 61 -
.../strategy/AWSEC2ListNodesStrategy.java | 103 --
.../strategy/AWSEC2ReviseParsedImage.java | 116 --
...curityGroupsAsNeededAndReturnRunOptions.java | 197 ---
.../suppliers/AWSEC2HardwareSupplier.java | 107 --
.../compute/suppliers/AWSEC2ImageSupplier.java | 158 ---
.../ec2/compute/suppliers/CallForImages.java | 90 --
.../aws/ec2/config/AWSEC2HttpApiModule.java | 80 --
.../aws/ec2/domain/AWSRunningInstance.java | 344 -----
.../aws/ec2/domain/LaunchSpecification.java | 580 ---------
.../jclouds/aws/ec2/domain/MonitoringState.java | 49 -
.../jclouds/aws/ec2/domain/PlacementGroup.java | 156 ---
.../domain/RegionNameAndPublicKeyMaterial.java | 36 -
.../java/org/jclouds/aws/ec2/domain/Spot.java | 198 ---
.../aws/ec2/domain/SpotInstanceRequest.java | 470 -------
.../org/jclouds/aws/ec2/features/AWSAMIApi.java | 124 --
.../aws/ec2/features/AWSInstanceApi.java | 92 --
.../jclouds/aws/ec2/features/AWSKeyPairApi.java | 85 --
.../aws/ec2/features/AWSSecurityGroupApi.java | 145 ---
.../jclouds/aws/ec2/features/MonitoringApi.java | 95 --
.../aws/ec2/features/PlacementGroupApi.java | 160 ---
.../aws/ec2/features/SpotInstanceApi.java | 245 ----
.../functions/CreatePlacementGroupIfNeeded.java | 77 --
.../ImportOrReturnExistingKeypair.java | 86 --
...SpotInstanceRequestToAWSRunningInstance.java | 60 -
.../ec2/options/AWSDescribeImagesOptions.java | 151 ---
.../aws/ec2/options/AWSRunInstancesOptions.java | 307 -----
.../ec2/options/CreateSecurityGroupOptions.java | 62 -
.../DescribeSpotPriceHistoryOptions.java | 114 --
.../options/RequestSpotInstancesOptions.java | 138 --
.../ec2/predicates/PlacementGroupAvailable.java | 64 -
.../ec2/predicates/PlacementGroupDeleted.java | 61 -
.../predicates/SpotInstanceRequestActive.java | 70 --
.../aws/ec2/reference/AWSEC2Constants.java | 40 -
.../AWSDescribeInstancesResponseHandler.java | 109 --
...C2DescribeSecurityGroupsResponseHandler.java | 124 --
.../aws/ec2/xml/AWSEC2IpPermissionHandler.java | 90 --
.../aws/ec2/xml/AWSEC2SecurityGroupHandler.java | 139 --
.../ec2/xml/AWSRunInstancesResponseHandler.java | 50 -
.../aws/ec2/xml/BaseAWSReservationHandler.java | 247 ----
.../xml/CreateSecurityGroupResponseHandler.java | 40 -
.../DescribePlacementGroupsResponseHandler.java | 72 --
...eservedInstancesOfferingResponseHandler.java | 71 --
...DescribeSpotPriceHistoryResponseHandler.java | 73 --
.../aws/ec2/xml/LaunchSpecificationHandler.java | 147 ---
.../aws/ec2/xml/MonitoringStateHandler.java | 54 -
.../aws/ec2/xml/PlacementGroupHandler.java | 66 -
.../aws/ec2/xml/ProductCodesHandler.java | 50 -
.../xml/ReservedInstancesOfferingHandler.java | 89 --
.../org/jclouds/aws/ec2/xml/SpotHandler.java | 73 --
.../aws/ec2/xml/SpotInstanceHandler.java | 148 ---
.../aws/ec2/xml/SpotInstancesHandler.java | 78 --
.../org.jclouds.providers.ProviderMetadata | 1 -
.../test/clojure/org/jclouds/aws/ec2_test.clj | 32 -
.../aws/ec2/AWSEC2ContextBuilderTest.java | 76 --
.../org/jclouds/aws/ec2/AWSEC2ProviderTest.java | 31 -
...BindLaunchSpecificationToFormParamsTest.java | 95 --
.../BindTagsToIndexedFormParamsTest.java | 61 -
.../compute/AWSEC2ComputeServiceExpectTest.java | 278 ----
.../compute/AWSEC2ComputeServiceLiveTest.java | 192 ---
.../compute/AWSEC2TemplateBuilderLiveTest.java | 363 ------
.../AWSEC2ComputeServiceContextModuleTest.java | 62 -
.../AWSEC2ImageExtensionLiveTest.java | 59 -
.../AWSEC2SecurityGroupExtensionExpectTest.java | 414 ------
.../AWSEC2SecurityGroupExtensionLiveTest.java | 33 -
.../AWSEC2SecurityGroupToSecurityGroupTest.java | 80 --
.../AWSRunningInstanceToNodeMetadataTest.java | 217 ----
.../PresentSpotRequestsAndInstancesTest.java | 97 --
.../BaseAWSEC2ComputeServiceExpectTest.java | 151 ---
.../AWSEC2CreateSecurityGroupIfNeededTest.java | 99 --
.../options/AWSEC2TemplateOptionsTest.java | 416 ------
.../compute/strategy/AWSEC2ImageParserTest.java | 239 ----
.../strategy/AWSEC2ReviseParsedImageTest.java | 111 --
...tyGroupsAsNeededAndReturnRunOptionsTest.java | 954 --------------
.../aws/ec2/features/AWSAMIApiLiveTest.java | 129 --
.../jclouds/aws/ec2/features/AWSAMIApiTest.java | 496 --------
.../AWSElasticBlockStoreApiLiveTest.java | 68 -
.../ec2/features/AWSInstanceApiLiveTest.java | 58 -
.../aws/ec2/features/AWSInstanceApiTest.java | 537 --------
.../aws/ec2/features/AWSKeyPairApiLiveTest.java | 206 ---
.../aws/ec2/features/AWSKeyPairApiTest.java | 132 --
.../features/AWSSecurityGroupApiLiveTest.java | 119 --
.../ec2/features/AWSSecurityGroupApiTest.java | 205 ---
.../aws/ec2/features/AWSSubnetApiLiveTest.java | 27 -
.../aws/ec2/features/BaseAWSEC2ApiTest.java | 132 --
.../aws/ec2/features/MonitoringApiLiveTest.java | 63 -
.../aws/ec2/features/MonitoringApiTest.java | 71 --
.../features/PlacementGroupApiExpectTest.java | 75 --
.../ec2/features/PlacementGroupApiLiveTest.java | 219 ----
.../aws/ec2/features/PlacementGroupApiTest.java | 134 --
.../ec2/features/SpotInstanceApiExpectTest.java | 75 --
.../ec2/features/SpotInstanceApiLiveTest.java | 213 ----
.../aws/ec2/features/SpotInstanceApiTest.java | 98 --
.../ec2/features/TagSecurityGroupLiveTest.java | 52 -
.../ImportOrReturnExistingKeypairTest.java | 112 --
...InstanceRequestToAWSRunningInstanceTest.java | 89 --
.../options/AWSDescribeImagesOptionsTest.java | 175 ---
.../ec2/options/AWSRunInstancesOptionsTest.java | 374 ------
.../DescribeSpotPriceHistoryOptionsTest.java | 117 --
.../RequestSpotInstancesOptionsTest.java | 141 ---
.../parse/DescribeInstancesResponseTest.java | 110 --
.../DescribeSecurityGroupsResponseTest.java | 73 --
...AWSDescribeInstancesResponseHandlerTest.java | 165 ---
.../xml/AWSRunInstancesResponseHandlerTest.java | 112 --
...cribePlacementGroupsResponseHandlerTest.java | 51 -
...vedInstancesOfferingResponseHandlerTest.java | 53 -
...ribeSpotPriceHistoryResponseHandlerTest.java | 70 --
.../aws/ec2/xml/MonitoringStateHandlerTest.java | 48 -
.../aws/ec2/xml/ProductCodesHandlerTest.java | 47 -
.../aws/ec2/xml/SpotInstanceHandlerTest.java | 136 --
.../aws/ec2/xml/SpotInstancesHandlerTest.java | 115 --
.../src/test/resources/alestic_canonical.xml | 119 --
.../src/test/resources/amzn_images.xml | 86 --
.../describe_image_attribute_productCodes.xml | 9 -
.../src/test/resources/describe_images_cc.xml | 31 -
.../src/test/resources/describe_instances_1.xml | 55 -
.../src/test/resources/describe_instances_2.xml | 986 ---------------
.../src/test/resources/describe_instances_3.xml | 5 -
.../resources/describe_instances_latest.xml | 132 --
.../resources/describe_instances_pending.xml | 82 --
.../resources/describe_placement_groups.xml | 10 -
.../describe_reserved_instances_offerings.xml | 15 -
.../resources/describe_security_groups_vpc.xml | 35 -
.../test/resources/describe_spot_instance.xml | 45 -
.../describe_spot_instance_requests.xml | 425 -------
.../resources/describe_spot_instance_tags.xml | 115 --
.../resources/describe_spot_instances_1.xml | 207 ---
.../resources/describe_spot_price_history.xml | 27 -
.../src/test/resources/monitoring.xml | 16 -
.../resources/request_spot_instances-ebs.xml | 52 -
.../test/resources/request_spot_instances.xml | 93 --
.../src/test/resources/rightscale_images.xml | 94 --
.../src/test/resources/run_instances_1.xml | 54 -
.../1.8.0-stratos/src/test/resources/vostok.xml | 19 -
1447 files changed, 156408 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/ec2/1.8.0-stratos/README.txt
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.8.0-stratos/README.txt b/dependencies/jclouds/apis/ec2/1.8.0-stratos/README.txt
deleted file mode 100644
index 11db7a2..0000000
--- a/dependencies/jclouds/apis/ec2/1.8.0-stratos/README.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# The jclouds API for Amazon's EC2 service (http://aws.amazon.com/ec2/).
-#
-# TODO: Implementation status.
-# TODO: Supported features.
-# TODO: Usage example.
-
-NOTE: The live tests in apis/ec2 will *not* work against AWS EC2 with AWS accounts created
-from December 04, 2013 and onward, due to those accounts only supporting VPC, and VPC requiring
-different parameters (ID rather than name) for referring to and acting on security groups.
-
-To run the EC2 live tests against AWS, go to providers/aws-ec2.
-
-apis/ec2 will retain the older security group name usage to support EC2 API shims,
-such as OpenStack, CloudStack, etc.
\ No newline at end of file